formatting and trivial cleanup

SVN-Revision: 6573

include/package-dumpinfo.mk

@@ -12,26 +12,27 @@ 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 "@@" ; \
+	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 "")
+	$(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
   endef
 endif

include/package-ipkg.mk

@@ -17,12 +17,20 @@ define BuildIPKG
     INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
     ifdef Package/$(1)/install
+      ifneq ($(CONFIG_PACKAGE_$(1)),)
+        compile: $$(IPKG_$(1))
+
         ifeq ($(CONFIG_PACKAGE_$(1)),y)
           install: $$(INFO_$(1))
         endif
 
-    ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),)
-      compile: $$(IPKG_$(1))
+        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
+
       else
         compile: $(1)-disabled
         $(1)-disabled:
@@ -30,13 +38,8 @@ define BuildIPKG
       endif
     endif
 
-  ifeq ($(FORCEREBUILD),y)
-    $$(IPKG_$(1)): FORCE
-  endif
-
     IDEPEND_$(1):=$$(strip $$(DEPENDS))
   
-  
     $(eval $(call BuildIPKGVariable,$(1),conffiles))
     $(eval $(call BuildIPKGVariable,$(1),preinst))
     $(eval $(call BuildIPKGVariable,$(1),postinst))
@@ -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)"; \
@@ -91,17 +92,5 @@ define BuildIPKG
 
     $$(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
 endif

include/package.mk

@@ -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 \,