- fixup whitespace damage after ulf

diff --git a/package/fusion/fusion.mk b/package/fusion/fusion.mk
index ec1e40bf6cb63117bb2c629945a35f5d3cd2622a..845a5741758bf47332af0c4b59692d25a42af223 100644 (file)
--- a/package/fusion/fusion.mk
+++ b/package/fusion/fusion.mk
@@ -21,7 +21,7 @@ $(LINUX_FUSION_HEADER):
        cp -dpf package/fusion/fusion.h $(LINUX_FUSION_HEADER)
 
 $(LINUX_FUSION_DIR)/$(LINUX_FUSION):
-       mkdir   -p $(LINUX_FUSION_DIR)
+       mkdir -p $(LINUX_FUSION_DIR)
        cp -dpf package/fusion/40-fusion.rules $(LINUX_FUSION_DIR)
        touch -c $@
 

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index a31cd78c832b2b82c2934574c6f583c3462379bf..24b303a84ba0d44c9b09e0f46e84cd36486bd539 100644 (file)
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -77,58 +77,58 @@ $(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagick.a
        touch -c $@
 
 $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB)
-       libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/coders
-       libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/filters
-       touch   $@
+       libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/coders
+       libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-6.3.5/modules-Q16/filters
+       touch $@
 
 $(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)
        ls -l $(IMAGEMAGICK_LIB) >> datefile
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-animate $(TARGET_DIR)/usr/bin/animate
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/animate
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/compare: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-compare $(TARGET_DIR)/usr/bin/compare
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/compare
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/composite: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-composite $(TARGET_DIR)/usr/bin/composite
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/composite
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/conjure: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-conjure $(TARGET_DIR)/usr/bin/conjure
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/conjure
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/display: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-display $(TARGET_DIR)/usr/bin/display
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/display
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/import: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-import $(TARGET_DIR)/usr/bin/import
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/import
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/mogrify: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-mogrify $(TARGET_DIR)/usr/bin/mogrify
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/mogrify
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/montage: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-montage $(TARGET_DIR)/usr/bin/montage
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/montage
-       touch   $@
+       touch $@
 
 $(TARGET_DIR)/usr/bin/convert: $(IMAGEMAGICK_LIB)
        $(IMAGEMAGICK_COPY) $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-convert $(TARGET_DIR)/usr/bin/convert
        -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/convert
-       touch   $@
+       touch $@
 
 imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \
-               $(IMAGEMAGICK_DIR)/.libinstall  \
+               $(IMAGEMAGICK_DIR)/.libinstall \
                $(IMAGEMAGICK_TARGET_BINARIES)
 
 imagemagick-clean:

diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index caccf90303e5367ea8654f17b66f4c78304f4758..89cab5fc6ec9fac14ebcbf36319d5f3af68314ef 100644 (file)
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -26,7 +26,7 @@ libdaemon-source: $(DL_DIR)/$(LIBDAEMON_SOURCE)
 $(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE)
        $(LIBDAEMON_CAT) $(DL_DIR)/$(LIBDAEMON_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        toolchain/patch-kernel.sh $(LIBDAEMON_DIR) package/libdaemon/ \*.patch
-       mkdir   -p $(PROJECT_BUILD_DIR)/patches
+       mkdir -p $(PROJECT_BUILD_DIR)/patches
        $(BZCAT) package/libdaemon/$(LIBDAEMON_NAME).patch.bz2 \
                > $(PROJECT_BUILD_DIR)/patches/$(LIBDAEMON_NAME).patch
        toolchain/patch-kernel.sh $(LIBDAEMON_DIR) $(PROJECT_BUILD_DIR)/patches/ $(LIBDAEMON_NAME)\*.patch

diff --git a/package/mdnsresponder/mdnsresponder.mk b/package/mdnsresponder/mdnsresponder.mk
index afa23c3c0a87fd0540205e7cb51d88af86d60615..f217a73452c8582be7387ffa18f3616724d7e0be 100644 (file)
--- a/package/mdnsresponder/mdnsresponder.mk
+++ b/package/mdnsresponder/mdnsresponder.mk
@@ -47,7 +47,7 @@ $(TARGET_DIR)/usr/sbin/mdnsd: $(STAGING_DIR)/usr/lib/libdns_sd.so
        # etc
        $(INSTALL) -m 0644 -D package/mdnsresponder/mDNSResponderPosix.conf $(TARGET_DIR)/etc/  
        # init
-       $(INSTALL) -m 0755 -D package/mdnsresponder/rc.mdnsresponder $(TARGET_DIR)/etc/init.d/S80mdnsresponder  
+       $(INSTALL) -m 0755 -D package/mdnsresponder/rc.mdnsresponder $(TARGET_DIR)/etc/init.d/S80mdnsresponder
 
 $(TARGET_DIR)/usr/bin/mDNSClientPosix: $(STAGING_DIR)/usr/lib/libdns_sd.so
        $(INSTALL) -m 755 -D $(MDNSRESPONDER_DIR)/mDNSPosix/build/prod/mDNSNetMonitor $(TARGET_DIR)/usr/sbin/

diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk
index 5a3787f2a2b0c6e0756d76bcec7fa39fd6d1c32f..6253c50d8a70417fec74eaf7cca62fb2365c992f 100644 (file)
--- a/package/modutils/modutils.mk
+++ b/package/modutils/modutils.mk
@@ -52,16 +52,14 @@ $(STAGING_DIR)/$(MODUTILS_TARGET_BINARY): $(MODUTILS_DIR1)/.build
        touch -c $@
 
 $(TARGET_DIR)/sbin/rmmod: $(STAGING_DIR)/$(MODUTILS_TARGET_BINARY)
-       cp -dpf $(STAGING_DIR)/sbin/depmod      $(TARGET_DIR)/sbin/depmod
-       cp -dpf $(STAGING_DIR)/sbin/insmod      $(TARGET_DIR)/sbin/insmod
-       cp -dpf $(STAGING_DIR)/sbin/modinfo     $(TARGET_DIR)/sbin/modinfo
-       ln -s   insmod $(TARGET_DIR)/sbin/kallsyms
-       ln -s   insmod $(TARGET_DIR)/sbin/ksyms
-       ln -s   insmod $(TARGET_DIR)/sbin/lsmod
-       ln -s   insmod $(TARGET_DIR)/sbin/modprobe
-       ln -s   insmod $(TARGET_DIR)/sbin/rmmod
-
-
+       cp -dpf $(STAGING_DIR)/sbin/depmod $(TARGET_DIR)/sbin/depmod
+       cp -dpf $(STAGING_DIR)/sbin/insmod $(TARGET_DIR)/sbin/insmod
+       cp -dpf $(STAGING_DIR)/sbin/modinfo $(TARGET_DIR)/sbin/modinfo
+       ln -s insmod $(TARGET_DIR)/sbin/kallsyms
+       ln -s insmod $(TARGET_DIR)/sbin/ksyms
+       ln -s insmod $(TARGET_DIR)/sbin/lsmod
+       ln -s insmod $(TARGET_DIR)/sbin/modprobe
+       ln -s insmod $(TARGET_DIR)/sbin/rmmod
 
 modutils: uclibc $(TARGET_DIR)/sbin/rmmod
 

diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 2fe86b499c88208863d012f00929054f0067dc54..a32ff4905908b5b07f1520d0edd0ae0ae1443d55 100644 (file)
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -52,7 +52,7 @@ $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY): $(NFS_UTILS_DIR)/.configured
        touch -c $@
 
 NFS_UTILS_TARGETS_  :=
-NFS_UTILS_TARGETS_y := usr/sbin/exportfs usr/sbin/rpc.mountd   \
+NFS_UTILS_TARGETS_y := usr/sbin/exportfs usr/sbin/rpc.mountd \
                        usr/sbin/rpc.nfsd usr/sbin/rpc.statd
 
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG)    += usr/sbin/rpcdebug

diff --git a/target/Makefile.in b/target/Makefile.in
index 5cb29356686fdd28a2d4611c7325dd59647ffe82..4dba6d89f557a9674b8f546079599abbbbcbb847 100644 (file)
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -18,11 +18,11 @@ include target/*/*.mk
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.
 
-ifeq   ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG))),y)
+ifeq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG))),y)
 #"))
-include        target/linux/Makefile.in
-#include       target/linux-experimental/Makefile.in
+include target/linux/Makefile.in
+#include target/linux-experimental/Makefile.in
 else
-include        target/linux/Makefile.in
+include target/linux/Makefile.in
 endif
 

diff --git a/toolchain/Config.in b/toolchain/Config.in
index a4b1af32fa9ec4c111220f891acc8d0f658f8aa0..85d7b341a253b35b9ce736373fa7cf1026d98ff2 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,4 +1,4 @@
-menu   "Toolchain type"
+menu "Toolchain type"
 choice
        prompt "Toolchain type"
        default BR2_TOOLCHAIN_BUILDROOT

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index e5868b6390a14673c94974a3ebe641880eade504..db85468b9970961a85b1e3a38850503d0c5f363f 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -33,7 +33,7 @@ endif
 
 
 # redefine if using an external prepatched gcc source
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),)
 GCC_SITE:=$(VENDOR_SITE)
 GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)
 endif
@@ -41,7 +41,7 @@ endif
 GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2
 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER)
 
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),y)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),y)
 ifeq ($(GCC_SNAP_DATE),)
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
 else

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 82a7bf95ee2ab7d509e281cb1971019213cc22e5..e9127578956962bd23b2217c3ba9a26ca09cf1a7 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -30,26 +30,26 @@ GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER)
 endif
 
 # redefine if using an external prepatched gcc source
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),)
 GCC_SITE:=$(VENDOR_SITE)
 GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)
 endif
 
 # define patch location
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),y)     # Normal toolchain
-ifeq ($(GCC_SNAP_DATE),)               # Not a snapshot
+ifeq ($(BR2_TOOLCHAIN_NORMAL),y) # Normal toolchain
+ifeq ($(GCC_SNAP_DATE),) # Not a snapshot
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-else                                   # Is a snapshot
-ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),) # Snapshot patch?
+else # Is a snapshot
+ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),) # Snapshot patch?
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_OFFICIAL_VER)
-else                                   # Normal patch to snapshot
+else # Normal patch to snapshot
 # Use the normal location, if the dedicated location does not exist
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-endif                                  # Snapshot patch
-endif                                  # Not a snapshot
-else                                   # Prepatched toolchain
+endif # Snapshot patch
+endif # Not a snapshot
+else # Prepatched toolchain
 GCC_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gcc-$(GCC_OFFICIAL_VER)
-endif                                  # Normal toolchain
+endif # Normal toolchain
 
 GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2
 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER)

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 60596aeb0a3c178e3cf5b5055fefc16aae467f9e..44250e09b2a8b0b75bf1f829085117e1339fe346 100644 (file)
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -20,7 +20,7 @@ GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION)
 GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION)
 else
 
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),y)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),y)
 GDB_SITE:=http://ftp.gnu.org/gnu/gdb
 else
 GDB_SITE:=$(VENDOR_SITE)
@@ -31,7 +31,7 @@ GDB_OFFICIAL_VERSION:=$(GDB_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GDB_RELEASE)
 GDB_SOURCE:=gdb-$(GDB_OFFICIAL_VERSION).tar.bz2
 GDB_CAT:=$(BZCAT)
 
-ifeq   ($(BR2_TOOLCHAIN_NORMAL),y)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),y)
 GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION)
 else
 GDB_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gdb-$(GDB_OFFICIAL_VERSION)