formatting and trivial cleanup

SVN-Revision: 6573

3 files changed, 71 insertions, 82 deletions

diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index e6a462863c..70ef0c51a5 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -6,32 +6,33 @@
 #
 
 ifneq ($(DUMP),)
-define Config
-  preconfig_$$(1) += echo "Preconfig: $(1)"; echo "Preconfig-Type: $(2)"; echo "Preconfig-Default: $(3)"; echo "Preconfig-Label: $(4)";
-endef
+  define Config
+    preconfig_$$(1) += echo "Preconfig: $(1)"; echo "Preconfig-Type: $(2)"; echo "Preconfig-Default: $(3)"; echo "Preconfig-Label: $(4)";
+  endef
 
-define Dumpinfo
-  dumpinfo: dumpinfo-$(1)
-  dumpinfo-$(1): FORCE
-	@echo "Package: $(1)" ; \
-	 $(if $(MENU),echo "Menu: $(MENU)";) \
-	 $(if $(SUBMENU),echo "Submenu: $(SUBMENU)";) \
-	 $(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)";) \
-	 $(if $(DEFAULT),echo "Default: $(DEFAULT)";)  \
-	 if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
-	 echo "Version: $(VERSION)"; \
-	 echo "Depends: $(DEPENDS)"; \
-	 echo "Provides: $(PROVIDES)"; \
-	 echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \
-	 echo "Section: $(SECTION)"; \
-	 echo "Category: $(CATEGORY)"; \
-	 echo "Title: $(TITLE)"; \
-	 echo "Maintainer: $(MAINTAINER)"; \
-	 echo -n "Description: "; \
-	 getvar $(call shvar,Package/$(1)/description); \
-	 $(if $(URL),echo;echo "$(URL)";) \
-	 echo "@@" ; \
-	 $$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@")
-	 $(if $$(preconfig_$(1)),@$$(preconfig_$(1)) echo "")
-endef
+  define Dumpinfo
+    dumpinfo: dumpinfo-$(1)
+    .SILENT: dumpinfo-$(1)
+    dumpinfo-$(1): FORCE
+	echo "Package: $(1)" ;
+	$(if $(MENU),echo "Menu: $(MENU)")
+	$(if $(SUBMENU),echo "Submenu: $(SUBMENU)")
+	$(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)")
+	$(if $(DEFAULT),echo "Default: $(DEFAULT)") 
+	if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi;
+	echo "Version: $(VERSION)"
+	echo "Depends: $(DEPENDS)"
+	echo "Provides: $(PROVIDES)"
+	echo "Build-Depends: $(PKG_BUILD_DEPENDS)"
+	echo "Section: $(SECTION)"
+	echo "Category: $(CATEGORY)"
+	echo "Title: $(TITLE)"
+	echo "Maintainer: $(MAINTAINER)"
+	echo -n "Description: "
+	getvar $(call shvar,Package/$(1)/description)
+	$(if $(URL),echo;echo "$(URL)")
+	echo "@@"
+	$$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@")
+	$(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
+  endef
 endif
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 0f98dcfe14..b71fce42a8 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -11,38 +11,41 @@ define BuildIPKGVariable
 endef
 
 ifeq ($(DUMP),)
-define BuildIPKG
-  IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
-  IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
-  INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
+  define BuildIPKG
+    IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
+    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
+    INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
-  ifdef Package/$(1)/install
-    ifeq ($(CONFIG_PACKAGE_$(1)),y)
-      install: $$(INFO_$(1))
-    endif
+    ifdef Package/$(1)/install
+      ifneq ($(CONFIG_PACKAGE_$(1)),)
+        compile: $$(IPKG_$(1))
 
-    ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),)
-      compile: $$(IPKG_$(1))
-    else
-      compile: $(1)-disabled
-      $(1)-disabled:
-	@echo "WARNING: skipping $(1) -- package not selected"
-    endif
-  endif
+        ifeq ($(CONFIG_PACKAGE_$(1)),y)
+          install: $$(INFO_$(1))
+        endif
 
-  ifeq ($(FORCEREBUILD),y)
-    $$(IPKG_$(1)): FORCE
-  endif
+        ifneq ($(MAKECMDGOALS),prereq)
+          ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
+            $(PKG_BUILD_DIR)/.built: package-rebuild
+            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
+          endif
+        endif
 
-  IDEPEND_$(1):=$$(strip $$(DEPENDS))
+      else
+        compile: $(1)-disabled
+        $(1)-disabled:
+		@echo "WARNING: skipping $(1) -- package not selected"
+      endif
+    endif
 
+    IDEPEND_$(1):=$$(strip $$(DEPENDS))
   
-  $(eval $(call BuildIPKGVariable,$(1),conffiles))
-  $(eval $(call BuildIPKGVariable,$(1),preinst))
-  $(eval $(call BuildIPKGVariable,$(1),postinst))
-  $(eval $(call BuildIPKGVariable,$(1),prerm))
-  $(eval $(call BuildIPKGVariable,$(1),postrm))
-  $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
+    $(eval $(call BuildIPKGVariable,$(1),conffiles))
+    $(eval $(call BuildIPKGVariable,$(1),preinst))
+    $(eval $(call BuildIPKGVariable,$(1),postinst))
+    $(eval $(call BuildIPKGVariable,$(1),prerm))
+    $(eval $(call BuildIPKGVariable,$(1),postrm))
+    $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
 	@rm -f $(PACKAGE_DIR)/$(1)_*
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@@ -52,9 +55,7 @@ define BuildIPKG
 		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
 			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
 		done; \
-		echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
-	)
-	( \
+		echo "Depends: $$$$DEPENDS"; \
 		echo "Source: $(SOURCE)"; \
 		echo "Section: $(SECTION)"; \
 		echo "Priority: $(PRIORITY)"; \
@@ -67,41 +68,29 @@ define BuildIPKG
 		$($(1)_COMMANDS) \
 	)
 
-  $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
+    $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
-	-find $$(IDIR_$(1)) -name CVS | xargs rm -rf
-	-find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+	-find $$(IDIR_$(1)) -name CVS   | xargs rm -rf
+	-find $$(IDIR_$(1)) -name .svn  | xargs rm -rf
 	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 	@[ -f $$(IPKG_$(1)) ] || false 
 
-  $$(INFO_$(1)): $$(IPKG_$(1))
+    $$(INFO_$(1)): $$(IPKG_$(1))
 	$(IPKG) install $$(IPKG_$(1))
 
-  $(1)-clean:
+    $(1)-clean:
 	rm -f $(PACKAGE_DIR)/$(1)_*
 
-  clean: $(1)-clean
+    clean: $(1)-clean
 
-  $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
+    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
 	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@
 
-  $$(eval $$(call Build/DefaultTargets,$(1)))
+    $$(eval $$(call Build/DefaultTargets,$(1)))
 
-  ifdef Package/$(1)/install
-    ifneq ($$(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),)
-      ifneq ($(MAKECMDGOALS),prereq)
-        ifneq ($(DUMP),1)
-          ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
-            $(PKG_BUILD_DIR)/.built: package-rebuild
-            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
-          endif
-        endif
-      endif
-    endif
-  endif
-endef
+  endef
 endif
diff --git a/include/package.mk b/include/package.mk
index 34ba9a2ed5..e9d73e4a06 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -21,8 +21,8 @@ define Build/DefaultTargets
     download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):
-		mkdir -p $(DL_DIR)
-		$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+	mkdir -p $(DL_DIR)
+	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
 
     $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
   endif
@@ -55,12 +55,11 @@ define Build/DefaultTargets
       $(PKG_BUILD_DIR)/.built: package-rebuild
     endif
 
+    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
     $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/stampfiles
 	$(Build/InstallDev)
 	touch $$@
-	
-    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
   endif
 
   package-rebuild: FORCE
@@ -74,7 +73,7 @@ define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-# <HACK> Support obsolete DESCRIPTION field>
+# <HACK> Support obsolete DESCRIPTION field
 ifndef Package/$(1)/description
 define Package/$(1)/description
 $(TITLE)$(subst \,