reduce rebuild time, remove non-performant rebuild targets

mk/package.mk

@@ -86,11 +86,6 @@ patch: ${_PATCH_COOKIE}
 configure: ${_CONFIGURE_COOKIE}
 build: ${_BUILD_COOKIE}
 fake: ${_FAKE_COOKIE}
-rebuild:
-	@if [ -f ${TOPDIR}/.rebuild.${PKG_NAME} ];then \
-		$(MAKE) clean; \
-		rm -f ${TOPDIR}/.rebuild.${PKG_NAME}; \
-	fi
 
 # our recursive build entry point
 build-all-pkgs: ${_IPKGS_COOKIE}
@@ -335,4 +330,4 @@ distclean: clean
 	rm -f ${FULLDISTFILES}
 
 .PHONY:	all refetch extract patch configure \
-	build rebuild fake package install clean build-all-pkgs
+	build fake package install clean build-all-pkgs

package/Makefile

@@ -25,21 +25,19 @@ package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 
 include $(TOPDIR)/package/Depends.mk
 
-DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
-REBUILD_PACKAGES:=$(patsubst %,%-rebuild,$(package-y) $(package-m))
-COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y))
 HOST_COMPILE_PACKAGES:=$(patsubst %,%-host-compile,$(hostpackage-y))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
 all: compile
-download: $(DOWNLOAD)
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files)
+download: $(patsubst %,%-download,$(package-y))
+clean: $(patsubst %,%-clean,$(package-) $(package-y) base-files)
 hostcompile: $(HOST_COMPILE_PACKAGES)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-compile: $(REBUILD_PACKAGES) $(COMPILE_PACKAGES)
+compile: $(COMPILE_PACKAGES)
 install: $(INSTALL_PACKAGES)
 else
-compile: $(REBUILD_PACKAGES) base-files-compile $(COMPILE_PACKAGES)
+compile: base-files-compile $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 endif
 
@@ -57,16 +55,14 @@ endif
 
 %-compile:
 	$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "
+	if test -f $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@); then \
+		$(MAKE) -C $(patsubst %-compile,%,$@) clean ; \
+		rm $(TOPDIR)/.rebuild.$(patsubst %-compile,%,$@) ; \
+	fi
 	$(MAKE) -C $(patsubst %-compile,%,$@) fake build-all-pkgs
 	$(CMD_TRACE) " done"
 	$(END_TRACE)
 
-%-rebuild:
-	$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
-	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
-	$(CMD_TRACE) " done"
-	$(END_TRACE)
-
 %-install:
 	$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
 	$(MAKE) -C $(patsubst %-install,%,$@) install