diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-08 08:15:27 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-08 08:15:27 +0000 |
| commit | ac1d92c425414bad889c1a60d0d2aee25581b74f (patch) | |
| tree | aaa3969c6c1d78dc7f9ff5ba2577551813ff7e4b | |
| parent | 6250131be126b91d7feb8ae4c02fd7ca3725cc9e (diff) | |
| download | buildroot-novena-ac1d92c425414bad889c1a60d0d2aee25581b74f.tar.gz buildroot-novena-ac1d92c425414bad889c1a60d0d2aee25581b74f.zip | |
package/: get rid of unneeded $(strip ..)
243 files changed, 363 insertions, 363 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 25eae8f83..ce6ad0f8f 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -192,7 +192,7 @@ $(BUILD_DIR)/%/.stamp_patched: fi; \ fi; \ ) -ifeq ($(strip $(BR2_UPDATE_CONFIG)),y) +ifeq ($(BR2_UPDATE_CONFIG),y) $(Q)(for file in config.guess config.sub; do \ for i in $$(find $(@D) -name $$file); do \ cp package/gnuconfig/$$file $$i; \ diff --git a/package/Makefile.in b/package/Makefile.in index 19c7c56b0..fe1d6ad9f 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -368,16 +368,16 @@ endif # X Windowing system XSERVER:= -ifeq ($(strip $(BR2_PACKAGE_TINYX)),y) +ifeq ($(BR2_PACKAGE_TINYX),y) XSERVER+=tinyx endif -ifeq ($(strip $(BR2_PACKAGE_XORG)),y) +ifeq ($(BR2_PACKAGE_XORG),y) XSERVER+=xorg endif -ifeq ($(strip $(BR2_PACKAGE_XORG7)),y) +ifeq ($(BR2_PACKAGE_XORG7),y) XSERVER+=xserver_xorg-server endif -ifeq ($(strip $(BR2_PACKAGE_XGGI)),y) +ifeq ($(BR2_PACKAGE_XGGI),y) XSERVER+=xggi endif diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 6918b7d3c..98783a5e2 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -43,6 +43,6 @@ acpid-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ACPID)),y) +ifeq ($(BR2_PACKAGE_ACPID),y) TARGETS+=acpid endif diff --git a/package/argus/argus.mk b/package/argus/argus.mk index f3496fe3a..c57c543fc 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -64,6 +64,6 @@ argus-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ARGUS)),y) +ifeq ($(BR2_PACKAGE_ARGUS),y) TARGETS+=argus endif diff --git a/package/at/at.mk b/package/at/at.mk index 6f7f33083..441bb25f6 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -72,6 +72,6 @@ at-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AT)),y) +ifeq ($(BR2_PACKAGE_AT),y) TARGETS+=at endif diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 156754828..ce7db66aa 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -133,6 +133,6 @@ host-autoconf-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AUTOCONF)),y) +ifeq ($(BR2_PACKAGE_AUTOCONF),y) TARGETS+=autoconf endif diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 2fac0129f..7924e8f5e 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -136,6 +136,6 @@ host-automake-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AUTOMAKE)),y) +ifeq ($(BR2_PACKAGE_AUTOMAKE),y) TARGETS+=automake endif diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 0746a047a..1e53c82c4 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -18,13 +18,13 @@ AVAHI_CAT:=$(ZCAT) AVAHI_TARGETS:= -ifeq ($(strip $(BR2_PACKAGE_AVAHI_AUTOIPD)),y) +ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y) AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-autoipd endif AVAHI_EXTRA_DEPS:= -ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y) +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon AVAHI_DISABLE_EXPAT:=--with-xml=expat # depend on the exact library file instead of expat so avahi isn't always @@ -35,7 +35,7 @@ AVAHI_DISABLE_EXPAT:=--disable-expat --with-xml=none endif -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS),y) AVAHI_DISABLE_DBUS:= AVAHI_EXTRA_DEPS+=$(STAGING_DIR)/usr/bin/dbus-daemon else @@ -169,7 +169,7 @@ $(TARGET_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.installed $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libavahi-*.so* cp -af $(STAGING_DIR)/etc/avahi/avahi-daemon.conf $(TARGET_DIR)/etc/avahi/ cp -af package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/ -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS),y) cp -dpf $(STAGING_DIR)/usr/bin/avahi-* $(TARGET_DIR)/usr/bin $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/avahi-* mkdir -p $(TARGET_DIR)/etc/dbus-1/system.d/ @@ -199,6 +199,6 @@ avahi-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AVAHI)),y) +ifeq ($(BR2_PACKAGE_AVAHI),y) TARGETS+=avahi endif diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 18cab3344..fb153866b 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -50,6 +50,6 @@ axel-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AXEL)),y) +ifeq ($(BR2_PACKAGE_AXEL),y) TARGETS+=axel endif diff --git a/package/bash/bash.mk b/package/bash/bash.mk index ea6d2f8c3..b0a51bcbc 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -112,6 +112,6 @@ bash-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BASH)),y) +ifeq ($(BR2_PACKAGE_BASH),y) TARGETS+=bash endif diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 1d7b16d44..d42a822ab 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -96,6 +96,6 @@ berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB) # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BERKELEYDB)),y) +ifeq ($(BR2_PACKAGE_BERKELEYDB),y) TARGETS+=berkeleydb endif diff --git a/package/bind/bind.mk b/package/bind/bind.mk index b943bccae..ff9630134 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -95,7 +95,7 @@ bind-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BIND)),y) +ifeq ($(BR2_PACKAGE_BIND),y) TARGETS+=bind endif diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 3bc156d5d..f46af1b7c 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -77,6 +77,6 @@ bison-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BISON)),y) +ifeq ($(BR2_PACKAGE_BISON),y) TARGETS+=bison endif diff --git a/package/boa/boa.mk b/package/boa/boa.mk index df4dd730d..3c09e9ba1 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -81,6 +81,6 @@ boa-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BOA)),y) +ifeq ($(BR2_PACKAGE_BOA),y) TARGETS+=boa endif diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk index 2e4edb64e..1881a9a4a 100644 --- a/package/bsdiff/bsdiff.mk +++ b/package/bsdiff/bsdiff.mk @@ -49,6 +49,6 @@ bsdiff-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BSDIFF)),y) +ifeq ($(BR2_PACKAGE_BSDIFF),y) TARGETS+=bsdiff endif diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index 47de1e7b5..e3e654cda 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -3,7 +3,7 @@ # busybox image for initramfs # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_INITRAMFS)),y) +ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y) BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs BR2_INITRAMFS_DIR:=$(PROJECT_BUILD_DIR)/initramfs @@ -13,7 +13,7 @@ $(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR) mkdir -p $(BUILD_DIR)/tmp $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR)/tmp $(TAR_OPTIONS) - -ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) +ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y) mv $(BUILD_DIR)/tmp/busybox $(BUSYBOX_INITRAMFS_DIR) else mv $(BUILD_DIR)/tmp/busybox-$(BUSYBOX_VERSION) $(BUSYBOX_INITRAMFS_DIR) @@ -144,6 +144,6 @@ endif # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_INITRAMFS)),y) +ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y) TARGETS+=busybox-initramfs endif diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 0d444ca61..a4599c33d 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -115,6 +115,6 @@ bzip2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_BZIP2)),y) +ifeq ($(BR2_PACKAGE_BZIP2),y) TARGETS+=bzip2 endif diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 8ee86e0f1..04e4ff6f2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -151,6 +151,6 @@ coreutils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_COREUTILS)),y) +ifeq ($(BR2_PACKAGE_COREUTILS),y) TARGETS+=coreutils endif diff --git a/package/cups/cups.mk b/package/cups/cups.mk index b902a2118..bd1e7a699 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -65,6 +65,6 @@ cups-clean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_CUPS)),y) +ifeq ($(BR2_PACKAGE_CUPS),y) TARGETS+=cups endif
\ No newline at end of file diff --git a/package/curl/curl.mk b/package/curl/curl.mk index ada4c002e..5414a4b85 100644 --- a/package/curl/curl.mk +++ b/package/curl/curl.mk @@ -89,9 +89,9 @@ curl-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_CURL)),y) +ifeq ($(BR2_PACKAGE_CURL),y) TARGETS+=curl endif -ifeq ($(strip $(BR2_PACKAGE_LIBCURL)),y) +ifeq ($(BR2_PACKAGE_LIBCURL),y) TARGETS+=libcurl endif diff --git a/package/customize/customize.mk b/package/customize/customize.mk index 2a105a70b..4fe4b8bbd 100644 --- a/package/customize/customize.mk +++ b/package/customize/customize.mk @@ -27,6 +27,6 @@ customize-clean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_CUSTOMIZE)),y) +ifeq ($(BR2_PACKAGE_CUSTOMIZE),y) TARGETS+=customize endif diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 05bb06a14..310a3253e 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -89,6 +89,6 @@ cvs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_CVS)),y) +ifeq ($(BR2_PACKAGE_CVS),y) TARGETS+=cvs endif diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 1024fc182..a66be0c70 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -68,6 +68,6 @@ dash-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DASH)),y) +ifeq ($(BR2_PACKAGE_DASH),y) TARGETS+=dash endif diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk index cfa6f0172..039d16039 100644 --- a/package/database/sqlite/sqlite.mk +++ b/package/database/sqlite/sqlite.mk @@ -75,6 +75,6 @@ sqlite-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y) +ifeq ($(BR2_PACKAGE_SQLITE),y) TARGETS+=sqlite endif diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 66e72ba38..8dcdad26d 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -74,6 +74,6 @@ dbus-glib-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DBUS_GLIB)),y) +ifeq ($(BR2_PACKAGE_DBUS_GLIB),y) TARGETS+=dbus-glib endif diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index cfa4e7feb..3c772d2c0 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,7 +11,7 @@ DBUS_CAT:=$(ZCAT) DBUS_BINARY:=bus/dbus-daemon DBUS_TARGET_BINARY:=usr/bin/dbus-daemon -ifeq ($(strip $(BR2_DBUS_EXPAT)),y) +ifeq ($(BR2_DBUS_EXPAT),y) DBUS_XML:=expat # depend on the exact library file instead of expat so dbus isn't always # considered out-of-date @@ -111,6 +111,6 @@ dbus-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS),y) TARGETS+=dbus endif diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk index cce6ad538..1ccd4808e 100644 --- a/package/devmem2/devmem2.mk +++ b/package/devmem2/devmem2.mk @@ -37,6 +37,6 @@ devmem2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DEVMEM2)),y) +ifeq ($(BR2_PACKAGE_DEVMEM2),y) TARGETS+=devmem2 endif diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 7eaa055c8..903e7cb02 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -121,15 +121,15 @@ dhcp-dirclean: # Toplevel Makefile options # ############################################################# -#ifeq ($(strip $(BR2_PACKAGE_ISC_DHCP)),y) +#ifeq ($(BR2_PACKAGE_ISC_DHCP),y) #TARGETS+=dhcp #endif -ifeq ($(strip $(BR2_PACKAGE_DHCP_SERVER)),y) +ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) TARGETS+=dhcp_server endif -ifeq ($(strip $(BR2_PACKAGE_DHCP_RELAY)),y) +ifeq ($(BR2_PACKAGE_DHCP_RELAY),y) TARGETS+=dhcp_relay endif -ifeq ($(strip $(BR2_PACKAGE_DHCP_CLIENT)),y) +ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) TARGETS+=dhcp_client endif diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 6e91d6f41..3c9f99d80 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -59,6 +59,6 @@ dialog-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DIALOG)),y) +ifeq ($(BR2_PACKAGE_DIALOG),y) TARGETS+=dialog endif diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 836f0abac..93075a078 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -121,6 +121,6 @@ diffutils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DIFFUTILS)),y) +ifeq ($(BR2_PACKAGE_DIFFUTILS),y) TARGETS+=diffutils endif diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index b407d6002..190c6428b 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -53,6 +53,6 @@ dillo-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DILLO)),y) +ifeq ($(BR2_PACKAGE_DILLO),y) TARGETS+=dillo endif diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 92d494ea8..c013608d3 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -191,6 +191,6 @@ directfb-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DIRECTFB)),y) +ifeq ($(BR2_PACKAGE_DIRECTFB),y) TARGETS+=directfb endif diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 576046d78..6b9b52d3d 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -66,6 +66,6 @@ distcc-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DISTCC)),y) +ifeq ($(BR2_PACKAGE_DISTCC),y) TARGETS+=distcc endif diff --git a/package/dm/dm.mk b/package/dm/dm.mk index a9c1bdd99..c5e7014b3 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -126,6 +126,6 @@ dm-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DM)),y) +ifeq ($(BR2_PACKAGE_DM),y) TARGETS+=dm endif diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index c705b517e..4589cdda8 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -100,6 +100,6 @@ dmalloc-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DMALLOC)),y) +ifeq ($(BR2_PACKAGE_DMALLOC),y) TARGETS+=dmalloc endif diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 873403a91..53a8561cf 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -62,6 +62,6 @@ dmraid-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DMRAID)),y) +ifeq ($(BR2_PACKAGE_DMRAID),y) TARGETS+=dmraid endif diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 582a0fc17..150d7a045 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -25,7 +25,7 @@ ifneq ($(BR2_LARGEFILE),y) DNSMASQ_COPTS+=-DNO_LARGEFILE endif -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS),y) DNSMASQ_DBUS:=$(TARGET_DIR)/usr/bin/dbus-daemon else DNSMASQ_DBUS:= @@ -40,7 +40,7 @@ $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE) touch $@ $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source $(DNSMASQ_DBUS) -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS),y) $(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \ $(DNSMASQ_DIR)/src/config.h else @@ -79,6 +79,6 @@ dnsmasq-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DNSMASQ)),y) +ifeq ($(BR2_PACKAGE_DNSMASQ),y) TARGETS+=dnsmasq endif diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 376f82cdf..672a7f3da 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -76,6 +76,6 @@ dropbear-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DROPBEAR)),y) +ifeq ($(BR2_PACKAGE_DROPBEAR),y) TARGETS+=dropbear endif diff --git a/package/dummy/dummy.mk b/package/dummy/dummy.mk index f4b5590a3..f8c535088 100644 --- a/package/dummy/dummy.mk +++ b/package/dummy/dummy.mk @@ -88,6 +88,6 @@ dummy-dirclean: # ############################################################# # This is how the dummy package is added to the list of rules to build. -ifeq ($(strip $(BR2_PACKAGE_DUMMY)),y) +ifeq ($(BR2_PACKAGE_DUMMY),y) TARGETS+=dummy endif diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 8ee5da0ef..adc89fe75 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -68,19 +68,19 @@ $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured #$(STRIPCMD) $(E2FSPROGS_DIR)/lib/lib*.so.*.* touch -c $@ -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_BADBLOCKS)) += ${TARGET_DIR}/sbin/badblocks -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_BLKID)) += ${TARGET_DIR}/sbin/blkid -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_CHATTR)) += ${TARGET_DIR}/bin/chattr -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_DUMPE2FS)) += ${TARGET_DIR}/sbin/dumpe2fs -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_E2LABEL)) += ${TARGET_DIR}/sbin/e2label -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_E2FSCK)) += ${TARGET_DIR}/sbin/e2fsck -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_FILEFRAG)) += ${TARGET_DIR}/sbin/filefrag -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_FSCK)) += ${TARGET_DIR}/sbin/fsck -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_LOGSAVE)) += ${TARGET_DIR}/sbin/logsave -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_LSATTR)) += ${TARGET_DIR}/bin/lsattr -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_MKE2FS)) += ${TARGET_DIR}/sbin/mke2fs -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND)) += ${TARGET_DIR}/sbin/mklost+found -E2FSPROGS_RM$(strip $(BR2_PACKAGE_E2FSPROGS_UUIDGEN)) += ${TARGET_DIR}/bin/uuidgen +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += ${TARGET_DIR}/sbin/badblocks +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BLKID) += ${TARGET_DIR}/sbin/blkid +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_CHATTR) += ${TARGET_DIR}/bin/chattr +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += ${TARGET_DIR}/sbin/dumpe2fs +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += ${TARGET_DIR}/sbin/e2label +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += ${TARGET_DIR}/sbin/e2fsck +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += ${TARGET_DIR}/sbin/filefrag +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_FSCK) += ${TARGET_DIR}/sbin/fsck +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += ${TARGET_DIR}/sbin/logsave +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_LSATTR) += ${TARGET_DIR}/bin/lsattr +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += ${TARGET_DIR}/sbin/mke2fs +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += ${TARGET_DIR}/sbin/mklost+found +E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += ${TARGET_DIR}/bin/uuidgen $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY) $(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) LDCONFIG=true \ @@ -89,21 +89,21 @@ $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY) ${TARGET_DIR}/sbin/fsck.ext[23] \ ${TARGET_DIR}/sbin/findfs \ ${TARGET_DIR}/sbin/tune2fs -ifneq ($(strip $(E2FSPROGS_RM)),) +ifneq ($(E2FSPROGS_RM),) rm -rf $(E2FSPROGS_RM) endif -ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS_MKE2FS)),y) +ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y) ln -sf mke2fs ${TARGET_DIR}/sbin/mkfs.ext2 ln -sf mke2fs ${TARGET_DIR}/sbin/mkfs.ext3 endif -ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS_E2FSCK)),y) +ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) ln -sf e2fsck ${TARGET_DIR}/sbin/fsck.ext2 ln -sf e2fsck ${TARGET_DIR}/sbin/fsck.ext3 endif -ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS_TUNE2FS)),y) +ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) ln -sf e2label ${TARGET_DIR}/sbin/tune2fs endif -ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS_FINDFS)),y) +ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y) ln -sf e2label ${TARGET_DIR}/sbin/findfs endif ifneq ($(BR2_HAVE_INFOPAGES),y) @@ -130,6 +130,6 @@ e2fsprogs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS)),y) +ifeq ($(BR2_PACKAGE_E2FSPROGS),y) TARGETS+=e2fsprogs endif diff --git a/package/editors/ed/ed.mk b/package/editors/ed/ed.mk index 01d4241cd..237e78a2b 100644 --- a/package/editors/ed/ed.mk +++ b/package/editors/ed/ed.mk @@ -54,6 +54,6 @@ ed-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ED)),y) +ifeq ($(BR2_PACKAGE_ED),y) TARGETS+=ed endif diff --git a/package/editors/nano/nano.mk b/package/editors/nano/nano.mk index 3135d59e4..fc417360d 100644 --- a/package/editors/nano/nano.mk +++ b/package/editors/nano/nano.mk @@ -54,6 +54,6 @@ nano-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NANO)),y) +ifeq ($(BR2_PACKAGE_NANO),y) TARGETS+=nano endif diff --git a/package/editors/uemacs/uemacs.mk b/package/editors/uemacs/uemacs.mk index a731f462f..2e845d492 100644 --- a/package/editors/uemacs/uemacs.mk +++ b/package/editors/uemacs/uemacs.mk @@ -43,6 +43,6 @@ uemacs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_UEMACS)),y) +ifeq ($(BR2_PACKAGE_UEMACS),y) TARGETS+=uemacs endif diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk index 826e3c702..fe82ac325 100644 --- a/package/editors/vim/vim.mk +++ b/package/editors/vim/vim.mk @@ -82,6 +82,6 @@ vim: uclibc pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_VIM)),y) +ifeq ($(BR2_PACKAGE_VIM),y) TARGETS+=vim endif diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk index 41fa53b89..5773c425d 100644 --- a/package/eeprog/eeprog.mk +++ b/package/eeprog/eeprog.mk @@ -41,6 +41,6 @@ eeprog-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_EEPROG)),y) +ifeq ($(BR2_PACKAGE_EEPROG),y) TARGETS+=eeprog endif diff --git a/package/expat/Makefile.in b/package/expat/Makefile.in index 3ea9348a6..1d5d6bc0b 100644 --- a/package/expat/Makefile.in +++ b/package/expat/Makefile.in @@ -1,3 +1,3 @@ -ifeq ($(strip $(BR2_PACKAGE_EXPAT)),y) +ifeq ($(BR2_PACKAGE_EXPAT),y) TARGETS+=expat endif diff --git a/package/expat/expat.mk b/package/expat/expat.mk index f64161a11..fc7e0599d 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -75,6 +75,6 @@ expat-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_EXPAT)),y) +ifeq ($(BR2_PACKAGE_EXPAT),y) TARGETS+=expat endif diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index 312c9927e..c9e855e12 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -42,6 +42,6 @@ ezxml-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_EZXML)),y) +ifeq ($(BR2_PACKAGE_EZXML),y) TARGETS+=ezxml endif diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index c30438859..020ad8828 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -127,10 +127,10 @@ fakeroot-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FAKEROOT)),y) +ifeq ($(BR2_PACKAGE_FAKEROOT),y) TARGETS+=fakeroot endif -ifeq ($(strip $(BR2_HOST_FAKEROOT)),y) +ifeq ($(BR2_HOST_FAKEROOT),y) HOST_SOURCE+=fakeroot-source endif diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index b8219d0ed..5c51bcd76 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -46,6 +46,6 @@ fbset-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FBSET)),y) +ifeq ($(BR2_PACKAGE_FBSET),y) TARGETS+=fbset endif diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index 8eb1d466f..f76194a79 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -51,6 +51,6 @@ fbv-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FBV)),y) +ifeq ($(BR2_PACKAGE_FBV),y) TARGETS+=fbv endif diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk index 19ab3e853..ffab1395c 100644 --- a/package/fconfig/fconfig.mk +++ b/package/fconfig/fconfig.mk @@ -45,6 +45,6 @@ fconfig-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FCONFIG)),y) +ifeq ($(BR2_PACKAGE_FCONFIG),y) TARGETS+=fconfig endif diff --git a/package/file/file.mk b/package/file/file.mk index 8ea4ad1f1..0ff1d1590 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -117,6 +117,6 @@ file-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FILE)),y) +ifeq ($(BR2_PACKAGE_FILE),y) TARGETS+=file endif diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index a60784c12..046e492d9 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -85,6 +85,6 @@ findutils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FINDUTILS)),y) +ifeq ($(BR2_PACKAGE_FINDUTILS),y) TARGETS+=findutils endif diff --git a/package/fis/fis.mk b/package/fis/fis.mk index 36c3c62cf..62ea3842f 100644 --- a/package/fis/fis.mk +++ b/package/fis/fis.mk @@ -46,6 +46,6 @@ fis-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FIS)),y) +ifeq ($(BR2_PACKAGE_FIS),y) TARGETS+=fis endif diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 5b968e38b..0063e85e2 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -76,7 +76,7 @@ $(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY) mandir=$(TARGET_DIR)/usr/man \ includedir=$(TARGET_DIR)/usr/include \ -C $(FLEX_DIR) install -ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y) +ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y) install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a endif ifneq ($(BR2_HAVE_INFOPAGES),y) @@ -108,7 +108,7 @@ flex-clean: includedir=$(TARGET_DIR)/usr/include \ -C $(FLEX_DIR) uninstall rm -f $(TARGET_DIR)/usr/bin/lex -ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y) +ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y) -rm $(STAGING_DIR)/lib/libfl.a endif -$(MAKE) -C $(FLEX_DIR) clean @@ -121,6 +121,6 @@ flex-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FLEX)),y) +ifeq ($(BR2_PACKAGE_FLEX),y) TARGETS+=flex endif diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk index dbd93704b..77c378197 100644 --- a/package/fuse/libfuse.mk +++ b/package/fuse/libfuse.mk @@ -72,6 +72,6 @@ libfuse-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBFUSE)),y) +ifeq ($(BR2_PACKAGE_LIBFUSE),y) TARGETS+=libfuse endif diff --git a/package/fusion/fusion.mk b/package/fusion/fusion.mk index e1aadba64..8158c00a0 100644 --- a/package/fusion/fusion.mk +++ b/package/fusion/fusion.mk @@ -35,7 +35,7 @@ linux-fusion-clean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LINUX_FUSION)),y) +ifeq ($(BR2_PACKAGE_LINUX_FUSION),y) TARGETS+=linux-fusion endif diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk index ac84fc085..5bdd67ed2 100644 --- a/package/gadgetfs-test/gadgetfs-test.mk +++ b/package/gadgetfs-test/gadgetfs-test.mk @@ -46,6 +46,6 @@ gadgetfs-test-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GADGETFS_TEST)),y) +ifeq ($(BR2_PACKAGE_GADGETFS_TEST),y) TARGETS+=gadgetfs-test endif diff --git a/package/games/doom-wad/doom-wads.mk b/package/games/doom-wad/doom-wads.mk index d5ea01da6..29c89ffcc 100644 --- a/package/games/doom-wad/doom-wads.mk +++ b/package/games/doom-wad/doom-wads.mk @@ -30,6 +30,6 @@ doom-wad: $(TARGET_DIR)/usr/share/games/doom/doom1.wad # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DOOM_WAD)),y) +ifeq ($(BR2_PACKAGE_DOOM_WAD),y) TARGETS+=doom-wad endif diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 8efc5ec71..66effec71 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -79,6 +79,6 @@ gawk-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GAWK)),y) +ifeq ($(BR2_PACKAGE_GAWK),y) TARGETS+=gawk endif diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 7858e1c37..2232d64bc 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -11,7 +11,7 @@ GETTEXT_CAT:=$(ZCAT) GETTEXT_BINARY:=gettext-runtime/src/gettext GETTEXT_TARGET_BINARY:=usr/bin/gettext -ifeq ($(strip $(BR2_PACKAGE_GETTEXT_STATIC)),y) +ifeq ($(BR2_PACKAGE_GETTEXT_STATIC),y) LIBINTL_TARGET_BINARY:=usr/lib/libintl.a else LIBINTL_TARGET_BINARY:=usr/lib/libintl.so @@ -29,7 +29,7 @@ $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE) $(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux touch $@ -ifeq ($(strip $(BR2_TOOLCHAIN_EXTERNAL)),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) IGNORE_EXTERNAL_GETTEXT:=--with-included-gettext endif @@ -172,9 +172,9 @@ libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY) # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBINTL)),y) +ifeq ($(BR2_PACKAGE_LIBINTL),y) TARGETS+=libintl endif -ifeq ($(strip $(BR2_PACKAGE_GETTEXT)),y) +ifeq ($(BR2_PACKAGE_GETTEXT),y) TARGETS+=gettext endif diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index f221b47bb..9712cc3fb 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -104,6 +104,6 @@ host-libgmp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGMP)),y) +ifeq ($(BR2_PACKAGE_LIBGMP),y) TARGETS+=libgmp endif diff --git a/package/grep/grep.mk b/package/grep/grep.mk index a1b9d12cc..764879e9c 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -65,6 +65,6 @@ grep-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GREP)),y) +ifeq ($(BR2_PACKAGE_GREP),y) TARGETS+=grep endif diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index 65dd6bb1f..e54c63f53 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -156,6 +156,6 @@ gtk2-engines-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GTK2_ENGINES)),y) +ifeq ($(BR2_PACKAGE_GTK2_ENGINES),y) TARGETS+=gtk2-engines endif diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index cf31c0cc1..f61e48b2e 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -61,6 +61,6 @@ gzip-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GZIP)),y) +ifeq ($(BR2_PACKAGE_GZIP),y) TARGETS+=gzip endif diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 2d7305071..6a0229008 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -110,6 +110,6 @@ hal-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_HAL)),y) +ifeq ($(BR2_PACKAGE_HAL),y) TARGETS+=hal endif diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 2ccb0ade4..be22d438b 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -48,6 +48,6 @@ hdparm-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_HDPARM)),y) +ifeq ($(BR2_PACKAGE_HDPARM),y) TARGETS+=hdparm endif diff --git a/package/hostap/hostap.mk b/package/hostap/hostap.mk index 702eefedf..35363919e 100644 --- a/package/hostap/hostap.mk +++ b/package/hostap/hostap.mk @@ -67,6 +67,6 @@ hostap-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_HOSTAP)),y) +ifeq ($(BR2_PACKAGE_HOSTAP),y) TARGETS+=hostap endif diff --git a/package/hotplug/diethotplug-0.5.tar b/package/hotplug/diethotplug-0.5.tar Binary files differindex 808867070..a22c3cd5b 100644 --- a/package/hotplug/diethotplug-0.5.tar +++ b/package/hotplug/diethotplug-0.5.tar diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index 2b5659cde..43a621885 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -40,6 +40,6 @@ hotplug-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_HOTPLUG)),y) +ifeq ($(BR2_PACKAGE_HOTPLUG),y) TARGETS+=hotplug endif diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index ac43809f0..8d2cfc743 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -45,6 +45,6 @@ hwdata-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_HWDATA)),y) +ifeq ($(BR2_PACKAGE_HWDATA),y) TARGETS+=hwdata endif diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 75a962451..18958bb9c 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -45,6 +45,6 @@ i2c-tools-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_I2C_TOOLS)),y) +ifeq ($(BR2_PACKAGE_I2C_TOOLS),y) TARGETS+=i2c-tools endif diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 7f9305732..dedc77563 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -71,6 +71,6 @@ icu-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ICU)),y) +ifeq ($(BR2_PACKAGE_ICU),y) TARGETS+=icu endif diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index f5863f664..cce85e93f 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -155,6 +155,6 @@ imagemagick-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_IMAGEMAGICK)),y) +ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) TARGETS+=imagemagick endif diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk index 4954b0ce7..8a64ef92e 100644 --- a/package/input-tools/input-tools.mk +++ b/package/input-tools/input-tools.mk @@ -61,6 +61,6 @@ input-tools-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_INPUT_TOOLS)),y) +ifeq ($(BR2_PACKAGE_INPUT_TOOLS),y) TARGETS+=input-tools endif diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index 75a03194c..c8e5b8ccb 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -41,6 +41,6 @@ iostat-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_IOSTAT)),y) +ifeq ($(BR2_PACKAGE_IOSTAT),y) TARGETS+=iostat endif diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 24dbddcfb..f44ee576e 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -54,6 +54,6 @@ iproute2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_IPROUTE2)),y) +ifeq ($(BR2_PACKAGE_IPROUTE2),y) TARGETS+=iproute2 endif diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index cc3d7c437..7611abb9e 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -18,25 +18,25 @@ IPSEC_TOOLS_TARGET_BINARY_RACOON:=usr/sbin/racoon IPSEC_TOOLS_TARGET_BINARY_RACOONCTL:=usr/sbin/racoonctl IPSEC_TOOLS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ipsec-tools/ -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport else IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport endif -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_NATT)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt else IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt endif -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_FRAG)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag else IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag endif -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_STATS)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats else IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats @@ -44,7 +44,7 @@ endif ifeq ($(BR2_INET_IPV6),y) -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_IPV6), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6 else IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) @@ -54,7 +54,7 @@ else # ignore user's choice if it doesn't IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) endif -ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y) +ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y) IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline endif @@ -118,20 +118,20 @@ ifneq ($(BR2_HAVE_MANPAGES),y) man8/racoonctl.8 man8/racoon.8 \ man8/plainrsa-gen.8 man8/setkey.8) endif -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y) install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \ libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \ racoon/.libs/libracoon.a racoon/.libs/libracoon.la) \ $(STAGING_DIR)/lib endif -ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y) +ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y) rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL) endif IPSEC_TOOLS_PROGS= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y) IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL) endif @@ -144,7 +144,7 @@ ipsec-tools-uninstall: ipsec-tools-clean: -$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall -$(MAKE) -C $(IPSEC_TOOLS_DIR) clean -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)),y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS),y) rm -f $(addprefix $(STAGING_DIR)/lib/, \ libipsec.a libipsec.la libracoon.a libracoon.la) endif @@ -153,6 +153,6 @@ endif ipsec-tools-dirclean: rm -rf $(IPSEC_TOOLS_DIR) -ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS)), y) +ifeq ($(BR2_PACKAGE_IPSEC_TOOLS), y) TARGETS+=ipsec-tools endif diff --git a/package/irda-utils/irda.mk b/package/irda-utils/irda.mk index 61d642655..8fcf9523a 100644 --- a/package/irda-utils/irda.mk +++ b/package/irda-utils/irda.mk @@ -52,6 +52,6 @@ irda-utils-dirclean: $(IRDA_UTILS_DIR)/.dirclean # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_IRDA_UTILS)),y) +ifeq ($(BR2_PACKAGE_IRDA_UTILS),y) TARGETS+=irda-utils endif diff --git a/package/java/concierge/concierge.mk b/package/java/concierge/concierge.mk index 7426f4ced..a03ac6128 100644 --- a/package/java/concierge/concierge.mk +++ b/package/java/concierge/concierge.mk @@ -35,6 +35,6 @@ concierge: $(TARGET_DIR)/usr/lib/concierge $(TARGET_DIR)/usr/bin/concierge # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_CONCIERGE)),y) +ifeq ($(BR2_PACKAGE_CONCIERGE),y) TARGETS+=concierge endif diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 9786ac0be..9899d93cd 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -92,6 +92,6 @@ jpeg-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_JPEG)),y) +ifeq ($(BR2_PACKAGE_JPEG),y) TARGETS+=jpeg endif diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 5f9127cd2..031681161 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -17,7 +17,7 @@ KEXEC_DEPS_y:= KEXEC_DEPS_$(KEXEC_PACKAGE_KEXEC) += zlib -ifeq ($(strip $(BR2_PACKAGE_KEXEC_ZLIB)),y) +ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONFIG_OPTS += --with-zlib else KEXEC_CONFIG_OPTS += --without-zlib @@ -77,6 +77,6 @@ kexec-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_KEXEC)),y) +ifeq ($(BR2_PACKAGE_KEXEC),y) TARGETS+=kexec endif diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index d18e3590d..58abd5537 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -79,6 +79,6 @@ kismet-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_KISMET)),y) +ifeq ($(BR2_PACKAGE_KISMET),y) TARGETS+=kismet endif diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index a1f61d532..fc1fd88b1 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -55,6 +55,6 @@ l2tp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_L2TP)),y) +ifeq ($(BR2_PACKAGE_L2TP),y) TARGETS+=l2tp endif diff --git a/package/less/less.mk b/package/less/less.mk index 4e373dfdc..4cf08391a 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -55,6 +55,6 @@ less-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LESS)),y) +ifeq ($(BR2_PACKAGE_LESS),y) TARGETS+=less endif diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 5add68fa7..73f316019 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -45,6 +45,6 @@ libaio-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBAIO)),y) +ifeq ($(BR2_PACKAGE_LIBAIO),y) TARGETS+=libaio endif diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index c3d309c38..593b70816 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -69,6 +69,6 @@ libcgi-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBCGI)),y) +ifeq ($(BR2_PACKAGE_LIBCGI),y) TARGETS+=libcgi endif diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index ef6ff68b2..8adef40ce 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -66,6 +66,6 @@ libcgicc-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBCGICC)),y) +ifeq ($(BR2_PACKAGE_LIBCGICC),y) TARGETS+=libcgicc endif diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 24cd66744..43e41a1ac 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -75,6 +75,6 @@ libdrm-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBDRM)),y) +ifeq ($(BR2_PACKAGE_LIBDRM),y) TARGETS+=libdrm endif diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index 73f048b71..2f02045f5 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -103,6 +103,6 @@ libeXosip2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBEXOSIP2)),y) +ifeq ($(BR2_PACKAGE_LIBEXOSIP2),y) TARGETS+=libeXosip2 endif diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 51c4b4b1d..0b8165c8c 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -82,6 +82,6 @@ libelf-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBELF)),y) +ifeq ($(BR2_PACKAGE_LIBELF),y) TARGETS+=libelf endif diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk index 653aea5e0..51143bd7d 100644 --- a/package/liberation/liberation.mk +++ b/package/liberation/liberation.mk @@ -42,6 +42,6 @@ liberation-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBERATION)),y) +ifeq ($(BR2_PACKAGE_LIBERATION),y) TARGETS+=liberation endif diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 11e9d974c..e31c0709d 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -65,6 +65,6 @@ libevent-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBEVENT)),y) +ifeq ($(BR2_PACKAGE_LIBEVENT),y) TARGETS+=libevent endif diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index 14e98c141..d7a9c80eb 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -60,6 +60,6 @@ libfloat-dirclean: # Toplevel Makefile options # ############################################################# -#ifeq ($(strip $(BR2_PACKAGE_LIBFLOAT)),y) +#ifeq ($(BR2_PACKAGE_LIBFLOAT),y) #TARGETS+=libfloat #endif diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 65e795331..d7a608ebf 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -79,6 +79,6 @@ libgcrypt-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGCRYPT)),y) +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) TARGETS+=libgcrypt endif diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 5ced37139..7e9c7dfe4 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -92,6 +92,6 @@ libglib12-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGLIB12)),y) +ifeq ($(BR2_PACKAGE_LIBGLIB12),y) TARGETS+=libglib12 endif diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 7793db7c7..a893cd9b9 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -71,6 +71,6 @@ libgpg-error-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGPG_ERROR)),y) +ifeq ($(BR2_PACKAGE_LIBGPG_ERROR),y) TARGETS+=libgpg-error endif diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index dd55a71c3..f2d5f1088 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -100,6 +100,6 @@ libgtk12-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBGTK12)),y) +ifeq ($(BR2_PACKAGE_LIBGTK12),y) TARGETS+=libgtk12 endif diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 148c68730..a82dc32a1 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -70,6 +70,6 @@ liblockfile-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBLOCKFILE)),y) +ifeq ($(BR2_PACKAGE_LIBLOCKFILE),y) TARGETS+=liblockfile endif diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 800782481..df97627b8 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -82,6 +82,6 @@ libosip2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBOSIP2)),y) +ifeq ($(BR2_PACKAGE_LIBOSIP2),y) TARGETS+=libosip2 endif diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 04e597580..063e77ec0 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -80,6 +80,6 @@ libpcap-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBPCAP)),y) +ifeq ($(BR2_PACKAGE_LIBPCAP),y) TARGETS+=libpcap endif diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index f04c40917..049ca5d22 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -65,7 +65,7 @@ libraw1394-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBRAW1394)),y) +ifeq ($(BR2_PACKAGE_LIBRAW1394),y) TARGETS+=libraw1394 endif diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index fcaba3124..07f84b6f3 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -79,6 +79,6 @@ libsysfs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBSYSFS)),y) +ifeq ($(BR2_PACKAGE_LIBSYSFS),y) TARGETS+=libsysfs endif diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 238bfa6f8..85e2d5b47 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -149,6 +149,6 @@ host-libtool-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBTOOL)),y) +ifeq ($(BR2_PACKAGE_LIBTOOL),y) TARGETS+=libtool endif diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index 281f64822..a5f794745 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -64,6 +64,6 @@ libungif-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBUNGIF)),y) +ifeq ($(BR2_PACKAGE_LIBUNGIF),y) TARGETS+=libungif endif diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 210eb161b..5f222942a 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -76,6 +76,6 @@ libusb-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBUSB)),y) +ifeq ($(BR2_PACKAGE_LIBUSB),y) TARGETS+=libusb endif diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 4c6e9e1ff..a38b35509 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -23,28 +23,28 @@ LIGHTTPD_CONF_OPT = \ $(DISABLE_IPV6) \ $(LIGHTTPD_LFS) -ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y) +ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPT += --with-openssl else LIGHTTPD_CONF_OPT += --without-openssl endif -ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_ZLIB)),y) +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib LIGHTTPD_CONF_OPT += --with-zlib else LIGHTTPD_CONF_OPT += --without-zlib endif -ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_BZIP2)),y) +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPT += --with-bzip2 else LIGHTTPD_CONF_OPT += --without-bzip2 endif -ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_PCRE)),y) +ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_CONF_ENV += PCRE_LIB="-lpcre" LIGHTTPD_DEPENDENCIES += pcre LIGHTTPD_CONF_OPT += --with-pcre diff --git a/package/links/links.mk b/package/links/links.mk index 5743c1bfd..c9de65b62 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -61,6 +61,6 @@ links: uclibc $(TARGET_DIR)/usr/bin/links # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LINKS)),y) +ifeq ($(BR2_PACKAGE_LINKS),y) TARGETS+=links endif diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index c2a378bea..802cb93d9 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -55,6 +55,6 @@ lm-sensors-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LM_SENSORS)),y) +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) TARGETS+=lm-sensors endif diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 41ab2af07..cd998c0eb 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -81,6 +81,6 @@ lrzsz-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LRZSZ)),y) +ifeq ($(BR2_PACKAGE_LRZSZ),y) TARGETS+=lrzsz endif diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 2e9f5fd1e..d4135b237 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -65,6 +65,6 @@ lsof-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LSOF)),y) +ifeq ($(BR2_PACKAGE_LSOF),y) TARGETS+=lsof endif diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 1cc8ff7de..5dc03cd93 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -64,6 +64,6 @@ ltp-testsuite-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LTP-TESTSUITE)),y) +ifeq ($(BR2_PACKAGE_LTP-TESTSUITE),y) TARGETS+=ltp-testsuite endif diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 24afde21c..25eecb7e2 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -82,6 +82,6 @@ ltrace-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LTRACE)),y) +ifeq ($(BR2_PACKAGE_LTRACE),y) TARGETS+=ltrace endif diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index e062d4db2..32e6c82dc 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -116,6 +116,6 @@ ltt: host-ltt-tracevisualizer ltt-tracedaemon # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LTT)),y) +ifeq ($(BR2_PACKAGE_LTT),y) TARGETS+=ltt endif diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 45a446cfd..b6a6ddef4 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -76,6 +76,6 @@ lua-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LUA)),y) +ifeq ($(BR2_PACKAGE_LUA),y) TARGETS+=lua endif diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 5bd565a07..ba4f55057 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -80,6 +80,6 @@ lvm2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LVM2)),y) +ifeq ($(BR2_PACKAGE_LVM2),y) TARGETS+=lvm2 endif diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 9b0f3883e..8d13d4428 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -131,15 +131,15 @@ lzma-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LZMA_HOST)),y) +ifeq ($(BR2_PACKAGE_LZMA_HOST),y) TARGETS+=lzma-host HOST_SOURCE+=lzma-source endif -ifeq ($(strip $(BR2_PACKAGE_LZMA_TARGET)),y) +ifeq ($(BR2_PACKAGE_LZMA_TARGET),y) TARGETS+=lzma-target endif -#ifeq ($(strip $(BR2_PACKAGE_LZMA_TARGET_HEADERS)),y) +#ifeq ($(BR2_PACKAGE_LZMA_TARGET_HEADERS),y) #TARGETS+=lzma-headers #endif diff --git a/package/m4/m4.mk b/package/m4/m4.mk index 570f9acd1..ac30c0ce6 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -132,6 +132,6 @@ host-m4-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_M4)),y) +ifeq ($(BR2_PACKAGE_M4),y) TARGETS+=m4 endif diff --git a/package/make/make.mk b/package/make/make.mk index 95bbfe0e0..da544a7be 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -70,6 +70,6 @@ make-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MAKE)),y) +ifeq ($(BR2_PACKAGE_MAKE),y) TARGETS+=make endif diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index be570e72e..af278de12 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -160,8 +160,8 @@ MATCHBOX_WM_OPTS:= MATCHBOX_WM_DEPS:=xlib_libXdamage MATCHBOX_WM_DEPS+=xlib_libXcursor -ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXCOMPOSITE)),y) -ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXPM)),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) MATCHBOX_WM_OPTS+=--enable-composite MATCHBOX_WM_DEPS+=xlib_libXcomposite MATCHBOX_WM_DEPS+=xlib_libXpm @@ -173,7 +173,7 @@ MATCHBOX_SNOTIFY_OPTS:= MATCHBOX_SNOTIFY_DEPS:= MATCHBOX_PANEL_DEPS:= -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_SNOTIFY)),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_SNOTIFY),y) MATCHBOX_SNOTIFY_OPTS+=--enable-startup-notification MATCHBOX_SNOTIFY_DEPS+=xlib_libSM MATCHBOX_SNOTIFY_DEPS+=$(TARGET_DIR)/usr/lib/$(MATCHBOX_SNOTIFY_BIN) @@ -182,28 +182,28 @@ else MATCHBOX_SNOTIFY_OPTS+=--disable-startup-notification endif -ifeq ($(strip $(BR2_PACKAGE_JPEG)),y) +ifeq ($(BR2_PACKAGE_JPEG),y) MATCHBOX_LIB_OPTS+=--enable-jpeg MATCHBOX_LIB_DEPS+=jpeg else MATCHBOX_LIB_OPTS+=--disable-jpeg endif -ifeq ($(strip $(BR2_PACKAGE_LIBPNG)),y) +ifeq ($(BR2_PACKAGE_LIBPNG),y) MATCHBOX_LIB_OPTS+=--enable-png MATCHBOX_LIB_DEPS+=libpng else MATCHBOX_LIB_OPTS+=--disable-png endif -ifeq ($(strip $(BR2_PACKAGE_PANGO)),y) +ifeq ($(BR2_PACKAGE_PANGO),y) MATCHBOX_LIB_OPTS+=--enable-pango MATCHBOX_LIB_DEPS+=pango else MATCHBOX_LIB_OPTS+=--disable-pango endif -ifeq ($(strip $(BR2_PACKAGE_X11R7_LIBXFT2)),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXFT2),y) MATCHBOX_LIB_OPTS+=--enable-xft MATCHBOX_LIB_DEPS+=xlib_libXft2 #MATCHBOX_WM_OPTS+=--enable-standalone-xft @@ -662,18 +662,18 @@ matchbox-keyboard-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX)),y) +ifeq ($(BR2_PACKAGE_MATCHBOX),y) TARGETS+=matchbox endif -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_PANEL)),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL),y) TARGETS+=matchbox-panel endif -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_DESKTOP)),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_DESKTOP),y) TARGETS+=matchbox-desktop endif -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_KEYBOARD)),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_KEYBOARD),y) TARGETS+=matchbox-keyboard endif diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index aa760663d..68a58dbe0 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -60,6 +60,6 @@ mdadm-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MDADM)),y) +ifeq ($(BR2_PACKAGE_MDADM),y) TARGETS+=mdadm endif diff --git a/package/mdnsresponder/mdnsresponder.mk b/package/mdnsresponder/mdnsresponder.mk index a85e3bdd0..ee03a2bdf 100644 --- a/package/mdnsresponder/mdnsresponder.mk +++ b/package/mdnsresponder/mdnsresponder.mk @@ -91,6 +91,6 @@ mdnsresponder-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MDNSRESPONDER)),y) +ifeq ($(BR2_PACKAGE_MDNSRESPONDER),y) TARGETS+=mdnsresponder endif diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk index 5e07a4111..a8f81b2e6 100644 --- a/package/memstat/memstat.mk +++ b/package/memstat/memstat.mk @@ -44,6 +44,6 @@ memstat-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MEMSTAT)),y) +ifeq ($(BR2_PACKAGE_MEMSTAT),y) TARGETS+=memstat endif diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 06e9b10b2..04b69ebe5 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -42,6 +42,6 @@ memtester-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MEMTESTER)),y) +ifeq ($(BR2_PACKAGE_MEMTESTER),y) TARGETS+=memtester endif diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 159321002..3b70bb23f 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -149,6 +149,6 @@ metacity-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_METACITY)),y) +ifeq ($(BR2_PACKAGE_METACITY),y) TARGETS+=metacity endif diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index db74bc1d1..01d9b3114 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -73,6 +73,6 @@ microcom: uclibc $(TARGET_DIR)/usr/bin/microcom # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MICROCOM)),y) +ifeq ($(BR2_PACKAGE_MICROCOM),y) TARGETS+=microcom endif diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index 5044ea287..c3552adf6 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -83,6 +83,6 @@ microperl-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MICROPERL)),y) +ifeq ($(BR2_PACKAGE_MICROPERL),y) TARGETS+=microperl endif diff --git a/package/microwin/microwin.mk b/package/microwin/microwin.mk index f0183926c..2951415aa 100644 --- a/package/microwin/microwin.mk +++ b/package/microwin/microwin.mk @@ -56,6 +56,6 @@ microwin-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MICROWIN)),y) +ifeq ($(BR2_PACKAGE_MICROWIN),y) TARGETS+=microwin endif diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index cc8a59712..1aaaa0474 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -56,6 +56,6 @@ mii-diag-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MIIDIAG)),y) +ifeq ($(BR2_PACKAGE_MIIDIAG),y) TARGETS+=mii-diag endif diff --git a/package/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index d37864407..fb6f032be 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -43,6 +43,6 @@ mkdosfs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MKDOSFS)),y) +ifeq ($(BR2_PACKAGE_MKDOSFS),y) TARGETS+=mkdosfs endif diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index cb6068fe0..f788fc458 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -42,7 +42,7 @@ $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR)/. $(MAKE) CC=$(TARGET_CC) -C $(MODULE_INIT_TOOLS_DIR) touch -c $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) -ifeq ($(strip $(BR2_PACKAGE_MODUTILS)),y) +ifeq ($(BR2_PACKAGE_MODUTILS),y) $(MODULE_INIT_TOOLS_TARGET_BINARY): \ $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) \ modutils @@ -50,7 +50,7 @@ else $(MODULE_INIT_TOOLS_TARGET_BINARY): \ $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) endif -ifeq ($(strip $(BR2_PACKAGE_MODUTILS)),y) +ifeq ($(BR2_PACKAGE_MODUTILS),y) $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) moveold endif STRIPPROG='$(STRIPPROG)' \ @@ -109,7 +109,7 @@ cross-depmod26-clean: cross-depmod26-dirclean: rm -rf $(MODULE_INIT_TOOLS_DIR2) -ifeq ($(strip $(BR2_PACKAGE_LINUX)),y) +ifeq ($(BR2_PACKAGE_LINUX),y) HOST_SOURCE+=module-init-tools-source endif @@ -118,6 +118,6 @@ endif ## Toplevel Makefile options # ############################################################## -ifeq ($(strip $(BR2_PACKAGE_MODULE_INIT_TOOLS)),y) +ifeq ($(BR2_PACKAGE_MODULE_INIT_TOOLS),y) TARGETS+=module-init-tools endif diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index e6d5a927e..f641ffea8 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -87,10 +87,10 @@ modutils-target-clean: # build modutils for use on the host system # ############################################################# -ifeq ($(strip $(BR2_mips)),y) +ifeq ($(BR2_mips),y) DEPMOD_EXTRA_STUFF=CFLAGS=-D__MIPSEB__ endif -ifeq ($(strip $(BR2_mipsel)),y) +ifeq ($(BR2_mipsel),y) DEPMOD_EXTRA_STUFF=CFLAGS=-D__MIPSEL__ endif @@ -138,6 +138,6 @@ cross-depmod-dirclean: ## Toplevel Makefile options # ############################################################## -ifeq ($(strip $(BR2_PACKAGE_MODUTILS)),y) +ifeq ($(BR2_PACKAGE_MODUTILS),y) TARGETS+=modutils endif diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk index 05f1107c2..83115eb08 100644 --- a/package/mpatrol/mpatrol.mk +++ b/package/mpatrol/mpatrol.mk @@ -86,6 +86,6 @@ mpatrol-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MPATROL)),y) +ifeq ($(BR2_PACKAGE_MPATROL),y) TARGETS+=mpatrol endif diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 85fbbd73a..bc01667fb 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -116,6 +116,6 @@ host-libmpfr-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBMPFR)),y) +ifeq ($(BR2_PACKAGE_LIBMPFR),y) TARGETS+=libmpfr endif diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 407b335a2..929bd6c41 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -48,6 +48,6 @@ mrouted-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MROUTED)),y) +ifeq ($(BR2_PACKAGE_MROUTED),y) TARGETS+=mrouted endif diff --git a/package/mtd/20050122/mtd.mk b/package/mtd/20050122/mtd.mk index 57c1e4f97..20edfb450 100644 --- a/package/mtd/20050122/mtd.mk +++ b/package/mtd/20050122/mtd.mk @@ -133,6 +133,6 @@ mtd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MTD)),y) +ifeq ($(BR2_PACKAGE_MTD),y) TARGETS+=mtd endif diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk index ea4f16301..7d74a6474 100644 --- a/package/mtd/20061007/mtd.mk +++ b/package/mtd/20061007/mtd.mk @@ -115,6 +115,6 @@ mtd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MTD)),y) +ifeq ($(BR2_PACKAGE_MTD),y) TARGETS+=mtd endif diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk index 840be9755..ca25ee56b 100644 --- a/package/mtd/mtd-utils.git/mtd.mk +++ b/package/mtd/mtd-utils.git/mtd.mk @@ -140,6 +140,6 @@ mtd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MTD)),y) +ifeq ($(BR2_PACKAGE_MTD),y) TARGETS+=mtd endif diff --git a/package/mtd/mtd-utils/mtd.mk b/package/mtd/mtd-utils/mtd.mk index fdf256e32..56120174c 100644 --- a/package/mtd/mtd-utils/mtd.mk +++ b/package/mtd/mtd-utils/mtd.mk @@ -123,6 +123,6 @@ mtd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MTD)),y) +ifeq ($(BR2_PACKAGE_MTD),y) TARGETS+=mtd endif diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 6629f24fa..c7774fdb1 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -1,12 +1,12 @@ -ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS)),y) +ifeq ($(BR2_PACKAGE_MTD_UTILS),y) include package/mtd/mtd-utils/mtd.mk endif -ifeq ($(strip $(BR2_PACKAGE_MTD_20061007)),y) +ifeq ($(BR2_PACKAGE_MTD_20061007),y) include package/mtd/20061007/mtd.mk endif -ifeq ($(strip $(BR2_PACKAGE_MTD_20050122)),y) +ifeq ($(BR2_PACKAGE_MTD_20050122),y) include package/mtd/20050122/mtd.mk endif -ifeq ($(strip $(BR2_PACKAGE_MTD_UTILS_GIT)),y) +ifeq ($(BR2_PACKAGE_MTD_UTILS_GIT),y) include package/mtd/mtd-utils.git/mtd.mk endif diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index 6792ee8e4..6e97c8a60 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -82,6 +82,6 @@ alsa-lib-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ALSA_LIB)),y) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) TARGETS+=alsa-lib endif diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 336118a30..3a54d1bf4 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -91,6 +91,6 @@ alsa-utils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ALSA_UTILS)),y) +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) TARGETS+=alsa-utils endif diff --git a/package/multimedia/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk index 5ff70fbf6..ef5c14c37 100644 --- a/package/multimedia/asterisk/asterisk.mk +++ b/package/multimedia/asterisk/asterisk.mk @@ -84,6 +84,6 @@ asterisk-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y) +ifeq ($(BR2_PACKAGE_ASTERISK),y) TARGETS+=asterisk endif diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk index 4ee7b0a0a..a324658cf 100644 --- a/package/multimedia/aumix/aumix.mk +++ b/package/multimedia/aumix/aumix.mk @@ -58,6 +58,6 @@ aumix-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_AUMIX)),y) +ifeq ($(BR2_PACKAGE_AUMIX),y) TARGETS+=aumix endif diff --git a/package/multimedia/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk index f5fdc9f76..e9a651dd8 100644 --- a/package/multimedia/festival/lexicons/festlex.mk +++ b/package/multimedia/festival/lexicons/festlex.mk @@ -41,6 +41,6 @@ festlex: $(FESTLEX_STATUS_DIR)/.installed # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FESTIVAL)),y) +ifeq ($(BR2_PACKAGE_FESTIVAL),y) TARGETS+=festlex endif diff --git a/package/multimedia/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk index 8456a4903..d44493c83 100644 --- a/package/multimedia/festival/voices/festvox.mk +++ b/package/multimedia/festival/voices/festvox.mk @@ -94,6 +94,6 @@ festvox: $(FESTVOX_STATUS_DIR)/.installed # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_FESTIVAL)),y) +ifeq ($(BR2_PACKAGE_FESTIVAL),y) TARGETS+=festvox endif diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk index 3ba4e572c..26f35c879 100644 --- a/package/multimedia/libid3tag/libid3tag.mk +++ b/package/multimedia/libid3tag/libid3tag.mk @@ -63,6 +63,6 @@ libid3tag-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBID3TAG)),y) +ifeq ($(BR2_PACKAGE_LIBID3TAG),y) TARGETS+=libid3tag endif diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk index c641f9fa7..85754545f 100644 --- a/package/multimedia/libmad/libmad.mk +++ b/package/multimedia/libmad/libmad.mk @@ -78,9 +78,9 @@ libmad-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBMAD)),y) +ifeq ($(BR2_PACKAGE_LIBMAD),y) TARGETS+=libmad endif -ifeq ($(strip $(BR2_PACKAGE_LIBMAD_TARGET_HEADERS)),y) +ifeq ($(BR2_PACKAGE_LIBMAD_TARGET_HEADERS),y) TARGETS+=libmad-headers endif diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk index 637845228..f6a74f338 100644 --- a/package/multimedia/libsndfile/libsndfile.mk +++ b/package/multimedia/libsndfile/libsndfile.mk @@ -60,6 +60,6 @@ libsndfile-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_LIBSNDFILE)),y) +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) TARGETS+=libsndfile endif diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index 308d51a4d..b99d68a32 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -132,8 +132,8 @@ tremor-dirclean: # Toplevel Makefile options # ############################################################ -ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS)),y) -ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_TREMOR)),y) +ifeq ($(BR2_PACKAGE_LIBVORBIS),y) +ifeq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y) TARGETS+=tremor endif TARGETS+=libvorbis diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index e81154541..266232581 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -13,7 +13,7 @@ MADPLAY_TARGET_BIN:=usr/bin/$(MADPLAY_BIN) # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. -ifeq ($(strip $(BR2_PACKAGE_MADPLAY_ALSA)),y) +ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) MADPLAY_USE_ALSA:=--with-alsa MADPLAY_ALSA_DEP:=alsa-lib endif @@ -68,6 +68,6 @@ madplay-source: $(DL_DIR)/$(MADPLAY_SOURCE) # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MADPLAY)),y) +ifeq ($(BR2_PACKAGE_MADPLAY),y) TARGETS+=madplay endif diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 3fab25781..caf979714 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -13,7 +13,7 @@ MPG123_TARGET_BIN:=usr/bin/mpg123 # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. -ifeq ($(strip $(BR2_PACKAGE_MPG123_ALSA)),y) +ifeq ($(BR2_PACKAGE_MPG123_ALSA),y) MPG123_USE_ALSA:=--with-audio=alsa MPG123_ALSA_DEP:=alsa-lib endif @@ -68,6 +68,6 @@ mpg123-source: $(DL_DIR)/$(MPG123_SOURCE) # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MPG123)),y) +ifeq ($(BR2_PACKAGE_MPG123),y) TARGETS+=mpg123 endif diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 1bc7a8cd6..b56f87ce8 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -71,6 +71,6 @@ mutt-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MUTT)),y) +ifeq ($(BR2_PACKAGE_MUTT),y) TARGETS+=mutt endif diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index fba0ae272..39c636eee 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -52,6 +52,6 @@ nbd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NBD)),y) +ifeq ($(BR2_PACKAGE_NBD),y) TARGETS+=nbd endif diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 00cc0fb1c..904a0136a 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -10,28 +10,28 @@ NCFTP_DIR:=$(BUILD_DIR)/ncftp-$(NCFTP_VERSION) NCFTP_TARGET_BINS:=ncftp -ifeq ($(strip $(BR2_PACKAGE_NCFTP_GET)),y) +ifeq ($(BR2_PACKAGE_NCFTP_GET),y) NCFTP_TARGET_BINS+=ncftpget endif -ifeq ($(strip $(BR2_PACKAGE_NCFTP_PUT)),y) +ifeq ($(BR2_PACKAGE_NCFTP_PUT),y) NCFTP_TARGET_BINS+=ncftpput endif -ifeq ($(strip $(BR2_PACKAGE_NCFTP_LS)),y) +ifeq ($(BR2_PACKAGE_NCFTP_LS),y) NCFTP_TARGET_BINS+=ncftpls endif -ifeq ($(strip $(BR2_PACKAGE_NCFTP_BATCH)),y) +ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y) NCFTP_TARGET_BINS+=ncftpbatch endif -ifeq ($(strip $(BR2_PACKAGE_NCFTP_SPOOLER)),y) +ifeq ($(BR2_PACKAGE_NCFTP_SPOOLER),y) #Someone needs to figure out what to do... NCFTP_TARGET_BINS+= endif -ifeq ($(strip $(BR2_PACKAGE_NCFTP_BOOKMARKS)),y) +ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y) NCFTP_TARGET_BINS+=ncftpbookmarks endif @@ -78,6 +78,6 @@ ncftp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NCFTP)),y) +ifeq ($(BR2_PACKAGE_NCFTP),y) TARGETS+=ncftp endif diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 7163af4d0..dc2d0620e 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -29,7 +29,7 @@ NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION) NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz NCURSES_CAT:=$(ZCAT) -ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y) +ifneq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y) NCURSES_WANT_STATIC=--disable-static endif @@ -104,13 +104,13 @@ $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurs $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION) cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/ -ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_PANEL)),y) +ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y) cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/ endif -ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_FORM)),y) +ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM),y) cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/ endif -ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_MENU)),y) +ifeq ($(BR2_PACKAGE_NCURSES_TARGET_MENU),y) cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/ endif ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo @@ -170,9 +170,9 @@ ncurses-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NCURSES)),y) +ifeq ($(BR2_PACKAGE_NCURSES),y) TARGETS+=ncurses endif -ifeq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y) +ifeq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y) TARGETS+=ncurses-headers endif diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 78c1ad35e..e92e134b6 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -11,17 +11,17 @@ NEON_CONF_OPT:=--enable-shared --without-gssapi --disable-rpath NEON_DEPENDENCIES:=pkgconfig -ifeq ($(strip $(BR2_PACKAGE_NEON_LIBXML2)),y) +ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y) NEON_CONF_OPT+=--with-libxml2=yes NEON_CONF_OPT+=--with-expat=no NEON_DEPENDENCIES+=libxml2 endif -ifeq ($(strip $(BR2_PACKAGE_NEON_EXPAT)),y) +ifeq ($(BR2_PACKAGE_NEON_EXPAT),y) NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la NEON_CONF_OPT+=--with-libxml2=no NEON_DEPENDENCIES+=expat endif -ifeq ($(strip $(BR2_PACKAGE_NEON_NOXML)),y) +ifeq ($(BR2_PACKAGE_NEON_NOXML),y) # webdav needs xml support NEON_CONF_OPT+=--disable-webdav endif diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index afa58624b..2db10e88e 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -63,6 +63,6 @@ netkitbase-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NETKITBASE)),y) +ifeq ($(BR2_PACKAGE_NETKITBASE),y) TARGETS+=netkitbase endif diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 2a053fbac..aa3ffcfe3 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -63,6 +63,6 @@ netkittelnet-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NETKITTELNET)),y) +ifeq ($(BR2_PACKAGE_NETKITTELNET),y) TARGETS+=netkittelnet endif diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 6bdee69e7..579d6a680 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -48,6 +48,6 @@ netplug-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NETPLUG)),y) +ifeq ($(BR2_PACKAGE_NETPLUG),y) TARGETS+=netplug endif diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 7613028b6..baa780bc6 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -74,6 +74,6 @@ newt-dirclean: slang-dirclean # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NEWT)),y) +ifeq ($(BR2_PACKAGE_NEWT),y) TARGETS+=newt endif diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 3b924ae8e..884f51de0 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -91,6 +91,6 @@ nfs-utils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NFS_UTILS)),y) +ifeq ($(BR2_PACKAGE_NFS_UTILS),y) TARGETS+=nfs-utils endif diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index bd10b6249..8e26b0d2f 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -77,6 +77,6 @@ ntfs-3g-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NTFS-3G)),y) +ifeq ($(BR2_PACKAGE_NTFS-3G),y) TARGETS+=ntfs-3g endif diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index d3c4c70aa..8aed9eefb 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -88,6 +88,6 @@ ntp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_NTP)),y) +ifeq ($(BR2_PACKAGE_NTP),y) TARGETS+=ntp endif diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index c280ed326..165c003d3 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -58,6 +58,6 @@ olsr-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_OLSR)),y) +ifeq ($(BR2_PACKAGE_OLSR),y) TARGETS+=olsr $(OLSR_PLUGINS) endif diff --git a/package/openmotif/openmotif.mk b/package/openmotif/openmotif.mk index 1178d68a2..6773cee8c 100644 --- a/package/openmotif/openmotif.mk +++ b/package/openmotif/openmotif.mk @@ -89,6 +89,6 @@ openmotif-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_OPENMOTIF)),y) +ifeq ($(BR2_PACKAGE_OPENMOTIF),y) TARGETS+=openmotif endif diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 8c6bfda83..2821d8921 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -76,6 +76,6 @@ ntpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_OPENNTPD)),y) +ifeq ($(BR2_PACKAGE_OPENNTPD),y) TARGETS+=ntpd endif diff --git a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch index 4a3338d20..1fba869ac 100644 --- a/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch +++ b/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch @@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6 +asm-obj-$(CONFIG_MWINCHIP3D) += match686.o + +obj-y += $(asm-obj-y) -+ifneq ($(strip $(asm-obj-y)),) ++ifneq ($(asm-obj-y),) + EXTRA_CFLAGS += -DASMV +endif + @@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6 +++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004 @@ -0,0 +1,112 @@ +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp -+ifeq ($(strip $(KLIPSMODULE)),) ++ifeq ($(KLIPSMODULE),) +FREESWANSRCDIR=. +else +FREESWANSRCDIR=../../../.. +endif -+ifeq ($(strip $(KLIPS_TOP)),) ++ifeq ($(KLIPS_TOP),) +KLIPS_TOP=../../.. +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include +endif diff --git a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch index 4a3338d20..1fba869ac 100644 --- a/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch +++ b/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch @@ -9774,7 +9774,7 @@ packaging/utils/kernelpatch 2.6 +asm-obj-$(CONFIG_MWINCHIP3D) += match686.o + +obj-y += $(asm-obj-y) -+ifneq ($(strip $(asm-obj-y)),) ++ifneq ($(asm-obj-y),) + EXTRA_CFLAGS += -DASMV +endif + @@ -13864,12 +13864,12 @@ packaging/utils/kernelpatch 2.6 +++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004 @@ -0,0 +1,112 @@ +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp -+ifeq ($(strip $(KLIPSMODULE)),) ++ifeq ($(KLIPSMODULE),) +FREESWANSRCDIR=. +else +FREESWANSRCDIR=../../../.. +endif -+ifeq ($(strip $(KLIPS_TOP)),) ++ifeq ($(KLIPS_TOP),) +KLIPS_TOP=../../.. +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include +endif diff --git a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch index 7f2520237..c3541bcd9 100644 --- a/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch +++ b/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch @@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6 +asm-obj-$(CONFIG_MWINCHIP3D) += match686.o + +obj-y += $(asm-obj-y) -+ifneq ($(strip $(asm-obj-y)),) ++ifneq ($(asm-obj-y),) + EXTRA_CFLAGS += -DASMV +endif + @@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6 +++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004 @@ -0,0 +1,112 @@ +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp -+ifeq ($(strip $(KLIPSMODULE)),) ++ifeq ($(KLIPSMODULE),) +FREESWANSRCDIR=. +else +FREESWANSRCDIR=../../../.. +endif -+ifeq ($(strip $(KLIPS_TOP)),) ++ifeq ($(KLIPS_TOP),) +KLIPS_TOP=../../.. +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include +endif diff --git a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch index 0b8257ab8..751eb2ba8 100644 --- a/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch +++ b/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch @@ -9785,7 +9785,7 @@ packaging/utils/kernelpatch 2.6 +asm-obj-$(CONFIG_MWINCHIP3D) += match686.o + +obj-y += $(asm-obj-y) -+ifneq ($(strip $(asm-obj-y)),) ++ifneq ($(asm-obj-y),) + EXTRA_CFLAGS += -DASMV +endif + @@ -13875,12 +13875,12 @@ packaging/utils/kernelpatch 2.6 +++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004 @@ -0,0 +1,112 @@ +# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp -+ifeq ($(strip $(KLIPSMODULE)),) ++ifeq ($(KLIPSMODULE),) +FREESWANSRCDIR=. +else +FREESWANSRCDIR=../../../.. +endif -+ifeq ($(strip $(KLIPS_TOP)),) ++ifeq ($(KLIPS_TOP),) +KLIPS_TOP=../../.. +override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include +endif diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index f630ebc8d..0429d9eac 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -61,6 +61,6 @@ openswan-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_OPENSWAN)),y) +ifeq ($(BR2_PACKAGE_OPENSWAN),y) TARGETS+=openswan endif diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 208dee493..4603d2de5 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -17,7 +17,7 @@ OPENVPN_TARGET_BINARY:=usr/sbin/openvpn # # Select thread model. # -ifeq ($(strip $(BR2_PTHREADS_NATIVE)),y) +ifeq ($(BR2_PTHREADS_NATIVE),y) THREAD_MODEL="--enable-threads=posix" else THREAD_MODEL=--enable-pthread @@ -81,6 +81,6 @@ openvpn-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_OPENVPN)),y) +ifeq ($(BR2_PACKAGE_OPENVPN),y) TARGETS+=openvpn endif diff --git a/package/patch/patch.mk b/package/patch/patch.mk index 8d70e069c..528eefc06 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -65,6 +65,6 @@ patch-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PATCH)),y) +ifeq ($(BR2_PACKAGE_PATCH),y) TARGETS+=patch endif diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index 85ebee724..1e42a2751 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -109,6 +109,6 @@ pcmcia-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PCMCIA)),y) +ifeq ($(BR2_PACKAGE_PCMCIA),y) TARGETS+=pcmcia endif diff --git a/package/php/php.mk b/package/php/php.mk index 74f89b400..1277251b0 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -199,6 +199,6 @@ php-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PHP)),y) +ifeq ($(BR2_PACKAGE_PHP),y) TARGETS+=php endif diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index 6ecb8f91f..da7702450 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -53,6 +53,6 @@ pkgconfig-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PKGCONFIG)),y) +ifeq ($(BR2_PACKAGE_PKGCONFIG),y) TARGETS+=pkgconfig endif diff --git a/package/portage/portage.mk b/package/portage/portage.mk index 3175e0443..1b86707de 100644 --- a/package/portage/portage.mk +++ b/package/portage/portage.mk @@ -155,6 +155,6 @@ sandbox-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PORTAGE)),y) +ifeq ($(BR2_PACKAGE_PORTAGE),y) TARGETS+=portage sandbox endif diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index bba0eead5..5ce931672 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -42,6 +42,6 @@ portmap-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PORTMAP)),y) +ifeq ($(BR2_PACKAGE_PORTMAP),y) TARGETS+=portmap endif diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 1a200e6f0..c428363ff 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -88,6 +88,6 @@ pppd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PPPD)),y) +ifeq ($(BR2_PACKAGE_PPPD),y) TARGETS+=pppd endif diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 44bf57366..78dd25afa 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -73,6 +73,6 @@ pptp-linux-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PPTP_LINUX)),y) +ifeq ($(BR2_PACKAGE_PPTP_LINUX),y) TARGETS+=pptp-linux endif diff --git a/package/procps/procps.mk b/package/procps/procps.mk index cc7204a61..fe8a55fdb 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -48,6 +48,6 @@ procps-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PROCPS)),y) +ifeq ($(BR2_PACKAGE_PROCPS),y) TARGETS+=procps endif diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 0340c7e41..cdae13621 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -80,6 +80,6 @@ proftpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PROFTPD)),y) +ifeq ($(BR2_PACKAGE_PROFTPD),y) TARGETS+=proftpd endif diff --git a/package/python/python.mk b/package/python/python.mk index ba2d23e77..a17df9c98 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -180,6 +180,6 @@ python-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_PYTHON)),y) +ifeq ($(BR2_PACKAGE_PYTHON),y) TARGETS+=python endif diff --git a/package/qte/qte.mk b/package/qte/qte.mk index dd573de2b..092144390 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -238,12 +238,12 @@ $(QTE_QTOPIA_IFILE): $(QTE_QTOPIA_FILE) qte: $(QTE_QTE_LIB) -ifeq ($(strip $(BR2_PACKAGE_QTE_QTOPIA)),y) +ifeq ($(BR2_PACKAGE_QTE_QTOPIA),y) qte: $(QTE_QTOPIA_IFILE) endif # kinda no-op right now, these are built anyhow -ifeq ($(strip $(BR2_PACKAGE_QTE_QVFB)),y) +ifeq ($(BR2_PACKAGE_QTE_QVFB),y) qte: $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) endif @@ -260,6 +260,6 @@ qte-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_QTE)),y) +ifeq ($(BR2_PACKAGE_QTE),y) TARGETS+=qte endif diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index 28be3a0a8..8e2465a33 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -395,6 +395,6 @@ qtopia4-status: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_QTOPIA4)),y) +ifeq ($(BR2_PACKAGE_QTOPIA4),y) TARGETS+=qtopia4 endif diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 988625562..0103d6b2b 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -180,6 +180,6 @@ quagga-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_QUAGGA)),y) +ifeq ($(BR2_PACKAGE_QUAGGA),y) TARGETS+=quagga endif diff --git a/package/raidtools/raidtools.mk b/package/raidtools/raidtools.mk index a765fdd8f..8584ce7af 100644 --- a/package/raidtools/raidtools.mk +++ b/package/raidtools/raidtools.mk @@ -65,6 +65,6 @@ raidtools2-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_RAIDTOOLS)),y) +ifeq ($(BR2_PACKAGE_RAIDTOOLS),y) TARGETS+=raidtools endif diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 4e748ea4e..781658eec 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -53,6 +53,6 @@ rdesktop-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_RDESKTOP)),y) +ifeq ($(BR2_PACKAGE_RDESKTOP),y) TARGETS+=rdesktop endif diff --git a/package/readline/readline.mk b/package/readline/readline.mk index a4763e8b7..635d75944 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -75,7 +75,7 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR -C $(READLINE_DIR) install-shared uninstall-doc chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) $(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) -ifneq ($(strip $(BR2_PACKAGE_READLINE_HEADERS)),y) +ifneq ($(BR2_PACKAGE_READLINE_HEADERS),y) rm -rf $(TARGET_DIR)/usr/include/readline endif @@ -93,9 +93,9 @@ readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY) readline-target-clean: -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall -ifeq ($(strip $(BR2_READLINE)),y) +ifeq ($(BR2_READLINE),y) TARGETS+=readline endif -ifeq ($(strip $(BR2_PACKAGE_READLINE_TARGET)),y) +ifeq ($(BR2_PACKAGE_READLINE_TARGET),y) TARGETS+=readline-target endif diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index a0928dacf..b788ebd06 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -75,6 +75,6 @@ rp-pppoe-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_RP_PPPOE)),y) +ifeq ($(BR2_PACKAGE_RP_PPPOE),y) TARGETS+=rp-pppoe endif diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 75f7b64a0..d3a058d4d 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -67,6 +67,6 @@ ruby-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_RUBY)),y) +ifeq ($(BR2_PACKAGE_RUBY),y) TARGETS+=ruby endif diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index 41f9bdcd6..2cf1fad89 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -79,6 +79,6 @@ rxvt-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_RXVT)),y) +ifeq ($(BR2_PACKAGE_RXVT),y) TARGETS+=rxvt endif diff --git a/package/samba/samba.mk b/package/samba/samba.mk index b9f0a9a9b..cecc0cdfe 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -106,7 +106,7 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) for file in $(SAMBA_TARGETS_y); do \ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \ done -ifeq ($(strip $(BR2_PACKAGE_SAMBA_SWAT)),y) +ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) cp -dpfr $(SAMBA_DIR)/../swat $(TARGET_DIR)/usr/ endif $(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d @@ -138,6 +138,6 @@ samba-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SAMBA)),y) +ifeq ($(BR2_PACKAGE_SAMBA),y) TARGETS+=samba endif diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index a11f794f9..22cb20135 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -106,6 +106,6 @@ sdl-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SDL)),y) +ifeq ($(BR2_PACKAGE_SDL),y) TARGETS+=sdl endif diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 522e05d42..76189e815 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -63,6 +63,6 @@ sdl_mixer-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SDL_MIXER)),y) +ifeq ($(BR2_PACKAGE_SDL_MIXER),y) TARGETS+=sdl_mixer endif diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk index 276c7f233..a0b8579cb 100644 --- a/package/sdl_ttf/sdl_ttf.mk +++ b/package/sdl_ttf/sdl_ttf.mk @@ -74,6 +74,6 @@ sdl_ttf-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SDL_TTF)),y) +ifeq ($(BR2_PACKAGE_SDL_TTF),y) TARGETS+=sdl_ttf endif diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 09803aee3..823d037a9 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -11,7 +11,7 @@ SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VERSION) SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION) SED_BINARY:=sed/sed SED_TARGET_BINARY:=bin/sed -ifeq ($(strip $(BR2_LARGEFILE)),y) +ifeq ($(BR2_LARGEFILE),y) SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64 endif #HOST_SED_DIR:=$(STAGING_DIR) @@ -174,6 +174,6 @@ sed-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SED)),y) +ifeq ($(BR2_PACKAGE_SED),y) TARGETS+=sed endif diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 14220bd64..d2aa63daf 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -77,6 +77,6 @@ setserial-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SETSERIAL)),y) +ifeq ($(BR2_PACKAGE_SETSERIAL),y) TARGETS+=setserial endif diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index 798b1d370..691d11410 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -44,6 +44,6 @@ sfdisk-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SFDISK)),y) +ifeq ($(BR2_PACKAGE_SFDISK),y) TARGETS+=sfdisk endif diff --git a/package/slang/slang.mk b/package/slang/slang.mk index e783acf3f..3b7869557 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -48,6 +48,6 @@ slang-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SLANG)),y) +ifeq ($(BR2_PACKAGE_SLANG),y) TARGETS+=slang endif diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 962dd9f25..6a936d1f2 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -73,6 +73,6 @@ smartmontools-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SMARTMONTOOLS)),y) +ifeq ($(BR2_PACKAGE_SMARTMONTOOLS),y) TARGETS+=smartmontools endif diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 10b3c9f07..a416e75cf 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -75,6 +75,6 @@ socat-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SOCAT)),y) +ifeq ($(BR2_PACKAGE_SOCAT),y) TARGETS+=socat endif diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 59d1579ac..8e3b3b079 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -21,7 +21,7 @@ $(eval $(call AUTOTARGETS,package,strace)) $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET) $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace rm -f $(TARGET_DIR)/usr/bin/strace-graph -ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) +ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils install -c $(TARGET_DIR)/usr/bin/strace \ $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 563e527b1..258c173ac 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -56,7 +56,7 @@ $(STUNNEL_DIR)/src/stunnel: $(STUNNEL_DIR)/.configured $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel $(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1 -ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) +ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils install -c $(TARGET_DIR)/usr/bin/stunnel \ $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel @@ -77,6 +77,6 @@ stunnel-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_STUNNEL)),y) +ifeq ($(BR2_PACKAGE_STUNNEL),y) TARGETS+=stunnel endif diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index e0c7815fe..3991eae97 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -77,11 +77,11 @@ sudo-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SUDO)),y) +ifeq ($(BR2_PACKAGE_SUDO),y) TARGETS+=sudo endif -ifeq ($(strip $(BR2_PACKAGE_LIBPAM)),y) +ifeq ($(BR2_PACKAGE_LIBPAM),y) SUDO_EXTRA_CONFIG=--enable-pam sudo: libpam endif diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 40d71ee23..2eddc321c 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -52,6 +52,6 @@ sysklogd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SYSKLOGD)),y) +ifeq ($(BR2_PACKAGE_SYSKLOGD),y) TARGETS+=sysklogd endif diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index e60a345dc..055206f5d 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -45,6 +45,6 @@ sysvinit-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_SYSVINIT)),y) +ifeq ($(BR2_PACKAGE_SYSVINIT),y) TARGETS+=sysvinit endif diff --git a/package/tar/tar.mk b/package/tar/tar.mk index ff7ee3a22..1b3ff4835 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -79,6 +79,6 @@ tar-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TAR)),y) +ifeq ($(BR2_PACKAGE_TAR),y) TARGETS+=tar endif diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index c5f1fc0df..bd046f533 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -40,10 +40,10 @@ $(TARGET_DIR)/usr/lib/libtcl8.4.so: $(TCL_DIR)/unix/libtcl8.4.so $(MAKE) INSTALL_ROOT=$(TARGET_DIR) -C $(TCL_DIR)/unix install -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so rm -Rf $(TARGET_DIR)/usr/man - -if [ "$(strip $(BR2_PACKAGE_TCL_DEL_ENCODINGS))" == "y" ]; then \ + -if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" == "y" ]; then \ rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \ fi - -if [ "$(strip $(BR2_PACKAGE_TCL_SHLIB_ONLY))" == "y" ]; then \ + -if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" == "y" ]; then \ rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \ fi @@ -63,6 +63,6 @@ tcl-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TCL)),y) +ifeq ($(BR2_PACKAGE_TCL),y) TARGETS+=tcl endif diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index b288940d2..a7c22fb5b 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -57,6 +57,6 @@ dhcpdump-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_DHCPDUMP)),y) +ifeq ($(BR2_PACKAGE_DHCPDUMP),y) TARGETS+=dhcpdump endif diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index d7331bd8c..011218163 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -73,6 +73,6 @@ tcpdump-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TCPDUMP)),y) +ifeq ($(BR2_PACKAGE_TCPDUMP),y) TARGETS+=tcpdump endif diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 97d0650b8..c9dbedfd3 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -76,6 +76,6 @@ tftpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TFTPD)),y) +ifeq ($(BR2_PACKAGE_TFTPD),y) TARGETS+=tftpd endif diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index af11eca81..a4685c8be 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -77,6 +77,6 @@ thttpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_THTTPD)),y) +ifeq ($(BR2_PACKAGE_THTTPD),y) TARGETS+=thttpd endif diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index d1b04a539..e17b10507 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -51,6 +51,6 @@ tinyhttpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TINYHTTPD)),y) +ifeq ($(BR2_PACKAGE_TINYHTTPD),y) TARGETS+=tinyhttpd endif diff --git a/package/tinylogin/tinylogin.mk b/package/tinylogin/tinylogin.mk index ac435ed3f..30b64d1ac 100644 --- a/package/tinylogin/tinylogin.mk +++ b/package/tinylogin/tinylogin.mk @@ -57,6 +57,6 @@ tinylogin-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TINYLOGIN)),y) +ifeq ($(BR2_PACKAGE_TINYLOGIN),y) TARGETS+=tinylogin endif diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index efaa921a0..39a23dc76 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -60,6 +60,6 @@ tn5250-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TN5250)),y) +ifeq ($(BR2_PACKAGE_TN5250),y) TARGETS+=tn5250 endif diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 092afa3c6..69b132df9 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -104,6 +104,6 @@ tslib-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TSLIB)),y) +ifeq ($(BR2_PACKAGE_TSLIB),y) TARGETS+=tslib endif diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk index 79bc1582a..7d6d94265 100644 --- a/package/ttcp/ttcp.mk +++ b/package/ttcp/ttcp.mk @@ -41,6 +41,6 @@ ttcp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_TTCP)),y) +ifeq ($(BR2_PACKAGE_TTCP),y) TARGETS+=ttcp endif diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 9186853c6..39b1f82dd 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -52,7 +52,7 @@ $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY) ( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf ) install -m 0755 -D $(UDEV_DIR)/udevstart $(TARGET_DIR)/sbin/udevstart rm -rf $(TARGET_DIR)/usr/share/man -ifneq ($(strip $(BR2_PACKAGE_UDEV_UTILS)),y) +ifneq ($(BR2_PACKAGE_UDEV_UTILS),y) rm -f $(TARGET_DIR)/usr/sbin/udevmonitor rm -f $(TARGET_DIR)/usr/bin/udevinfo rm -f $(TARGET_DIR)/usr/bin/udevtest @@ -76,7 +76,7 @@ udev-dirclean: $(UDEV_DIRCLEAN_DEPS) rm -rf $(UDEV_DIR) ##################################################################### -ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y) +ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y) .PHONY: udev-volume_id udev-volume_id-clean udev-volume_id-dirclean $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION): @@ -120,7 +120,7 @@ UDEV_DIRCLEAN_DEPS+=udev-volume_id-dirclean endif ##################################################################### -ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y) +ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y) .PHONY: udev-scsi_id udev-scsi_id-clean udev-scsi_id-dirclean $(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) @@ -156,14 +156,14 @@ endif # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_UDEV)),y) +ifeq ($(BR2_PACKAGE_UDEV),y) TARGETS+=udev endif -ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y) +ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y) TARGETS+=udev-volume_id endif -ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y) +ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y) TARGETS+=udev-scsi_id endif diff --git a/package/udhcp/udhcp.mk b/package/udhcp/udhcp.mk index 0f0b06373..8faf58217 100644 --- a/package/udhcp/udhcp.mk +++ b/package/udhcp/udhcp.mk @@ -69,6 +69,6 @@ udhcp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_UDHCP)),y) +ifeq ($(BR2_PACKAGE_UDHCP),y) TARGETS+=udhcp endif diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index 3ac7e7fac..b19f926e7 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -94,6 +94,6 @@ udpcast-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_UDPCAST)),y) +ifeq ($(BR2_PACKAGE_UDPCAST),y) TARGETS+=udpcast endif diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index 241a021da..705b74507 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -42,6 +42,6 @@ usbmount-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_USBMOUNT)),y) +ifeq ($(BR2_PACKAGE_USBMOUNT),y) TARGETS+=usbmount endif diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index fb7f6ce23..497cb218d 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -56,6 +56,6 @@ usbutils-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_USBUTILS)),y) +ifeq ($(BR2_PACKAGE_USBUTILS),y) TARGETS+=usbutils endif diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 9466a850b..4cb0e71ed 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -86,6 +86,6 @@ util-linux-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_UTIL-LINUX)),y) +ifeq ($(BR2_PACKAGE_UTIL-LINUX),y) TARGETS+=util-linux endif diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 07af110d5..d0640a40e 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -83,6 +83,6 @@ valgrind-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_VALGRIND)),y) +ifeq ($(BR2_PACKAGE_VALGRIND),y) TARGETS+=valgrind endif diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index 114c02673..0cca65b20 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -57,6 +57,6 @@ vpnc-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_VPNC)),y) +ifeq ($(BR2_PACKAGE_VPNC),y) TARGETS+=vpnc endif diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 9fc3370e8..c1cca563c 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -69,6 +69,6 @@ vsftpd-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_VSFTPD)),y) +ifeq ($(BR2_PACKAGE_VSFTPD),y) TARGETS+=vsftpd endif diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 5750d90a8..3e3397304 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -72,6 +72,6 @@ vtun-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_VTUN)),y) +ifeq ($(BR2_PACKAGE_VTUN),y) TARGETS+=vtun endif diff --git a/package/webif/webif.mk b/package/webif/webif.mk index a2c4a80c6..d9f3e049b 100644 --- a/package/webif/webif.mk +++ b/package/webif/webif.mk @@ -25,12 +25,12 @@ $(TARGET_DIR)/www/webif.css: $(WEBIF_DIR)/.built mkdir -p $(TARGET_DIR)/www cat $(WEBIF_SOURCE)/files/etc/httpd.conf >> $(TARGET_DIR)/etc/httpd.conf cp -dpfr $(WEBIF_SOURCE)/files/usr/lib/webif $(TARGET_DIR)/usr/lib/ -ifneq ($(strip $(BR2_PACKAGE_WEBIF_LANGUAGES)),y) +ifneq ($(BR2_PACKAGE_WEBIF_LANGUAGES),y) rm -rf $(TARGET_DIR)/usr/lib/webif/lang endif $(INSTALL) -m0755 $(WEBIF_DIR)/webif-page $(TARGET_DIR)/usr/bin/ $(INSTALL) -m0755 $(WEBIF_DIR)/bstrip $(TARGET_DIR)/usr/bin/ -ifeq ($(strip $(BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML)),y) +ifeq ($(BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML),y) @if [ -f "$(TARGET_DIR)/www/index.html" ]; then \ echo; \ echo "webif WARNING:"; \ @@ -66,6 +66,6 @@ webif-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_WEBIF)),y) +ifeq ($(BR2_PACKAGE_WEBIF),y) TARGETS+=webif endif diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 65be610e1..3c56c8e59 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -55,6 +55,6 @@ wget-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_WGET)),y) +ifeq ($(BR2_PACKAGE_WGET),y) TARGETS+=wget endif diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index e26352a33..deca74fb7 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -52,6 +52,6 @@ wipe-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_WIPE)),y) +ifeq ($(BR2_PACKAGE_WIPE),y) TARGETS+=wipe endif diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk index 06fe8fa76..b8c3f6946 100644 --- a/package/wireless-tools/wireless-tools.mk +++ b/package/wireless-tools/wireless-tools.mk @@ -53,6 +53,6 @@ wireless-tools-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_WIRELESS_TOOLS)),y) +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) TARGETS+=wireless-tools endif diff --git a/package/x11r7/mcookie/mcookie.mk b/package/x11r7/mcookie/mcookie.mk index 67e2cd84e..12ef47579 100644 --- a/package/x11r7/mcookie/mcookie.mk +++ b/package/x11r7/mcookie/mcookie.mk @@ -15,6 +15,6 @@ mcookie: $(TARGET_DIR)/usr/bin/mcookie # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MCOOKIE)),y) +ifeq ($(BR2_PACKAGE_MCOOKIE),y) TARGETS+=mcookie endif diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index 47de48a9f..e87af1645 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -77,7 +77,7 @@ mesa3d-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MESA3D)),y) +ifeq ($(BR2_PACKAGE_MESA3D),y) TARGETS+=mesa3d endif # :mode=makefile: diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk index 4e207fdd9..492160442 100644 --- a/package/x11r7/xapp_xman/xapp_xman.mk +++ b/package/x11r7/xapp_xman/xapp_xman.mk @@ -78,7 +78,7 @@ xapp_xman: xapp_xman-depends $(XAPP_XMAN_DIR)/.installed # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_XAPP_XMAN)),y) +ifeq ($(BR2_PACKAGE_XAPP_XMAN),y) TARGETS+=xapp_xman endif diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index 588771e98..111898c71 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -80,7 +80,7 @@ xdata_xcursor-themes: xdata_xcursor-themes-depends $(XDATA_XCURSOR_THEMES_DIR)/. # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_XDATA_XCURSOR_THEMES)),y) +ifeq ($(BR2_PACKAGE_XDATA_XCURSOR_THEMES),y) TARGETS+=xdata_xcursor-themes endif diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index fcf2a1ee5..99b106189 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -74,7 +74,7 @@ xfont_font-util-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_XFONT_FONT_UTIL)),y) +ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y) TARGETS+=xfont_font-util endif diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 14fb36134..27e860962 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -10,7 +10,7 @@ XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserv XSERVER_XORG_SERVER_AUTORECONF = NO XSERVER_XORG_SERVER_INSTALL_STAGING = YES -ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y) +ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) XSERVER_XORG_MESA_DEPS:=mesa3d XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg @@ -18,13 +18,13 @@ else XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg endif -ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y) +ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y) XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev else XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev endif -ifeq ($(strip $(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR)),y) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y) XSERVER_XORG_NULL_CURSOR:=--enable-null-root-cursor else XSERVER_XORG_NULL_CURSOR:=--disable-null-root-cursor @@ -54,7 +54,7 @@ XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data # Optional packages -ifeq ($(strip $(BR2_PACKAGE_TSLIB)),y) +ifeq ($(BR2_PACKAGE_TSLIB),y) XSERVER_XORG_SERVER_DEPENDENCIES += tslib XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts" endif diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 56e4b6bcc..8413c6540 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -59,6 +59,6 @@ xerces-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_XERCES)),y) +ifeq ($(BR2_PACKAGE_XERCES),y) TARGETS+=xerces endif diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 40928defe..801133bb3 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -96,6 +96,6 @@ xfsprogs-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_XFSPROGS)),y) +ifeq ($(BR2_PACKAGE_XFSPROGS),y) TARGETS+=xfsprogs endif diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 32243e918..27c1e0113 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -78,9 +78,9 @@ zlib-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_ZLIB)),y) +ifeq ($(BR2_PACKAGE_ZLIB),y) TARGETS+=zlib endif -ifeq ($(strip $(BR2_PACKAGE_ZLIB_TARGET_HEADERS)),y) +ifeq ($(BR2_PACKAGE_ZLIB_TARGET_HEADERS),y) TARGETS+=zlib-headers endif |