From fb9d19603c957127799d5a2db0509ebba4a473cc Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 21 Aug 2007 19:33:00 +0000 Subject: - fixup whitespace damage after ulf --- package/fusion/fusion.mk | 2 +- package/imagemagick/imagemagick.mk | 26 +++++++++++++------------- package/libdaemon/libdaemon.mk | 2 +- package/mdnsresponder/mdnsresponder.mk | 2 +- package/modutils/modutils.mk | 18 ++++++++---------- package/nfs-utils/nfs-utils.mk | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) (limited to 'package') diff --git a/package/fusion/fusion.mk b/package/fusion/fusion.mk index ec1e40bf6..845a57417 100644 --- 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 a31cd78c8..24b303a84 100644 --- 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 caccf9030..89cab5fc6 100644 --- 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 afa23c3c0..f217a7345 100644 --- 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 5a3787f2a..6253c50d8 100644 --- 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 2fe86b499..a32ff4905 100644 --- 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 -- cgit v1.2.3