[ELDK] [PATCH] White space cleanup

Wolfgang Denk wd at denx.de
Fri Apr 30 12:10:36 CEST 2010


This cleanup was triggered by a mysterious

	Makefile:97: *** missing >>endif<<

error message.  It turned out that there was a trailing space in the
line before (# 96), and the problem was with GNU Make 3.80 only (which
is known to have issues with trailing white space.  Ironically enough,
we had to update to GNU Make 3.81 anyway ...

Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: Detlev Zundel <dzu at denx.de>
---
 Makefile                   |   48 ++++++++++++++++++++++----------------------
 custom/sample_app/rules.mk |   10 ++++----
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 1c59bba..eb69485 100644
--- a/Makefile
+++ b/Makefile
@@ -21,38 +21,38 @@
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # All hope abandon, ye who enter in!
 #############################################################
-TOPDIR            := $(shell pwd)
+TOPDIR		  := $(shell pwd)
 CONFIG_CONFIG_IN   = Config.in
 CONFIG_DEFCONFIG   = .defconfig
 CONFIG_PACKAGES_IN = packages/Config.in
-CONFIG             = scripts/kconfig
-BUILD             := $(TOPDIR)/build
+CONFIG		   = scripts/kconfig
+BUILD		  := $(TOPDIR)/build
 ifeq ($(wildcard custom/rootfs_devices.tab),)
-DEV_TAB           := config/rootfs_devices.tab
+DEV_TAB		  := config/rootfs_devices.tab
 else
-DEV_TAB           := custom/rootfs_devices.tab
+DEV_TAB		  := custom/rootfs_devices.tab
 endif
-BUILD_RFS         := $(BUILD)/rootfs
-CRAMFS_FILE       := $(BUILD)/images/image.cramfs
-EXT2_FILE         := $(BUILD)/images/image.ext2
-JFFS2_FILE        := $(BUILD)/images/image.jffs2
-UBIFS_FILE        := $(BUILD)/images/image.ubifs
-URAMDISK_FILE     := $(BUILD)/images/uRamdisk
-SQFS_DEV_TAB      := $(BUILD)/images/squashfs_devices.tab
-SQUASHFS_FILE     := $(BUILD)/images/image.squashfs
-
-MKDEV_SCRIPT      := /tmp/mkdev.rfsb.tmp
-STATUS_DIR        := status
+BUILD_RFS	  := $(BUILD)/rootfs
+CRAMFS_FILE	  := $(BUILD)/images/image.cramfs
+EXT2_FILE	  := $(BUILD)/images/image.ext2
+JFFS2_FILE	  := $(BUILD)/images/image.jffs2
+UBIFS_FILE	  := $(BUILD)/images/image.ubifs
+URAMDISK_FILE	  := $(BUILD)/images/uRamdisk
+SQFS_DEV_TAB	  := $(BUILD)/images/squashfs_devices.tab
+SQUASHFS_FILE	  := $(BUILD)/images/image.squashfs
+
+MKDEV_SCRIPT	  := /tmp/mkdev.rfsb.tmp
+STATUS_DIR	  := status
 STAMP_CLEAN	  := $(STATUS_DIR)/stamp.clean
-STAMP_ADD_DIRS    := $(STATUS_DIR)/stamp.add-dirs
+STAMP_ADD_DIRS	  := $(STATUS_DIR)/stamp.add-dirs
 STAMP_RFSB_SKEL   := $(STATUS_DIR)/stamp.rfsb-skel
-STAMP_CHROOT      := $(STATUS_DIR)/stamp.chroot
+STAMP_CHROOT	  := $(STATUS_DIR)/stamp.chroot
 STAMP_ELDK_PKGS   := $(STATUS_DIR)/stamp.eldk-pkgs
 STAMP_CUSTOM_PKGS := $(STATUS_DIR)/stamp.custom-pkgs
-STAMP_ROOTFS      := $(STATUS_DIR)/stamp.rootfs
+STAMP_ROOTFS	  := $(STATUS_DIR)/stamp.rootfs
 STAMP_CUSTOM_COPY := $(STATUS_DIR)/stamp.custom-copy
 
-noconfig_targets := menuconfig config oldconfig randconfig \
+noconfig_targets  := menuconfig config oldconfig randconfig \
 	defconfig allyesconfig allnoconfig release tags
 
 # Pull in the user's configuration file if we are building something
@@ -93,7 +93,7 @@ ifeq ($(strip $$($(2))),y)
   $(1) += $(3)
 endif
 endef
-image_targets = 
+image_targets =
 IMAGE_CONFIGS = EXT2 URAMDISK JFFS2 CRAMFS SQUASHFS UBIFS
 $(foreach img,$(IMAGE_CONFIGS),$(eval $(call ADD_CONDITIONAL,image_targets,IMAGE_$(img),$$($(img)_FILE))))
 $(info Current target list is $(image_targets))
@@ -161,8 +161,8 @@ $(STAMP_ADD_DIRS):
 # Make sure build directory contains some vital directories
 	@echo "Populating $(BUILD) with directories"
 	@for dir in images rootfs \
-           rootfs/{bin,dev,etc,ftp,home,lib,proc,sbin,tmp} \
-           rootfs/{usr,usr/sbin,usr/bin,var,var/log,var/run} ; \
+	   rootfs/{bin,dev,etc,ftp,home,lib,proc,sbin,tmp} \
+	   rootfs/{usr,usr/sbin,usr/bin,var,var/log,var/run} ; \
 	do \
 	    scripts/mkdir_safe $(BUILD)/$$dir ;\
 	done ;\
@@ -243,7 +243,7 @@ distclean: pkgs_clean config_clean
 # Handle packages
 ############################################################
 
-$(STAMP_CUSTOM_PKGS):	
+$(STAMP_CUSTOM_PKGS):
 	make pkgs
 	touch $(STAMP_CUSTOM_PKGS)
 
diff --git a/custom/sample_app/rules.mk b/custom/sample_app/rules.mk
index debfc82..626f640 100644
--- a/custom/sample_app/rules.mk
+++ b/custom/sample_app/rules.mk
@@ -21,11 +21,11 @@ sample_app-uninstall:
 sample_app-dist: sample_app-clean
 	cd $(APP_DIR) && tar czvf ../sample_app.tar.gz *
 
-############################################################# 
-# 
-# Toplevel Makefile options 
-# 
-############################################################# 
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
 ifeq ($(strip $(CUSTOM_sample_app)),y)
 TARGETS+=sample_app
 TARGETS_install+=sample_app-install
-- 
1.6.2.5



More information about the eldk mailing list