aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-08-22 11:47:22 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-08-22 11:47:22 +0000
commit3471ebe0a3d5c74856ce8fe813345136a5f2aaf3 (patch)
tree68589110b570cc20f3a8b039f3f715cc3890a061 /package
parente1c81b632752f1158191388714ab30f2994a56dc (diff)
downloadbuildroot-3471ebe0a3d5c74856ce8fe813345136a5f2aaf3.tar.gz
buildroot-3471ebe0a3d5c74856ce8fe813345136a5f2aaf3.tar.bz2
- random whitespace cleanup
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.in2
-rw-r--r--package/hal/hal.mk19
-rw-r--r--package/udev/udev.mk10
-rw-r--r--package/vpnc/vpnc.mk22
4 files changed, 25 insertions, 28 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 8f0aefe651..a2fccb8d23 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -1,4 +1,4 @@
-ifndef MAKE
+ifndef MAKE
MAKE:=make
endif
ifndef HOSTMAKE
diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index e452ebd6ad..537b60a41b 100644
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -13,7 +13,7 @@ HAL_TARGET_BINARY:=usr/sbin/hald
GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \
-I$(STAGING_DIR)/lib/glib/include
-GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \
+GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \
$(STAGING_DIR)/lib/libgmodule-2.0.so \
$(STAGING_DIR)/lib/libgobject-2.0.so \
$(STAGING_DIR)/lib/libgthread-2.0.so
@@ -77,14 +77,15 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
rm -rf $(TARGET_DIR)/etc/PolicyKit
$(INSTALL) -m 0755 -D package/hal/S98haldaemon $(TARGET_DIR)/etc/init.d
rm -rf $(TARGET_DIR)/etc/rc.d
- for file in hald-addon-acpi* hald-addon-cpufreq \
- hald-addon-keyboard hald-addon-pmu \
- hald-probe-pc-floppy hald-probe-printer \
- hald-probe-serial hald-probe-smbios \
- hal-storage-eject hal-storage-closetray \
- hal-system-power-pmu hald-probe-input \
- hald-probe-hiddev hald-addon-hid-ups; do \
- rm -f $(TARGET_DIR)/usr/libexec/$$file; \
+ for file in hald-addon-acpi* hald-addon-cpufreq \
+ hald-addon-keyboard hald-addon-pmu \
+ hald-probe-pc-floppy hald-probe-printer \
+ hald-probe-serial hald-probe-smbios \
+ hal-storage-eject hal-storage-closetray \
+ hal-system-power-pmu hald-probe-input \
+ hald-probe-hiddev hald-addon-hid-ups; \
+ do \
+ rm -f $(TARGET_DIR)/usr/libexec/$$file; \
done
-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index e5560353c0..fd2c8bdc3d 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -92,11 +92,11 @@ $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION):
-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so
$(STAGING_DIR)/usr/lib/libvolume_id.la: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
- $(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/usr/lib/libvolume_id.la
- $(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
- $(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
- $(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
- $(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+ $(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/usr/lib/libvolume_id.la
+ $(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+ $(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+ $(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+ $(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/libvolume_id.la
$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.la
$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index b5f41db016..254145382a 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -31,22 +31,18 @@ $(VPNC_BINARY): $(VPNC_DIR)/.configured
CC=$(TARGET_CC) -C $(VPNC_DIR)
$(VPNC_TARGET_BINARY): $(VPNC_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- DESTDIR=$(TARGET_DIR) \
- BINDIR=/usr/local/bin \
- SBINDIR=/usr/local/sbin \
- ETCDIR=/etc/vpnc \
- MANDIR=/usr/local/share/man \
- VERSION=$(VPNC_VERSION) \
- INCLUDE=$(STAGING_DIR)/usr/include \
- LDFLAGS="-g -lgcrypt -lgpg-error" \
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ DESTDIR=$(TARGET_DIR) \
+ BINDIR=/usr/local/bin \
+ SBINDIR=/usr/local/sbin \
+ ETCDIR=/etc/vpnc \
+ MANDIR=/usr/share/man \
+ VERSION=$(VPNC_VERSION) \
+ INCLUDE=$(STAGING_DIR)/usr/include \
+ LDFLAGS="-g -lgcrypt -lgpg-error" \
-C $(VPNC_DIR) install
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
-# CFLAGS+="-W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -DVERSION=\"$(VPNC_VERSION)\" -c" \
-
-
-
vpnc: uclibc $(VPNC_TARGET_BINARY)
vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)