X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/91c71dd9accc12d164a95814276f2f05f1b28a5a..c8ff8610bfef399cbbd968acd395aca5acb6902f:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index 799456b1b..c3fc01c7d 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
 
 all: compile
 
-include $(TMP_DIR)/.pkgdeps
+include $(TMP_DIR)/.packagedeps
 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
@@ -22,30 +22,20 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
 
-%-download: FORCE
-	$(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(TARGET_DIR) FORCE
-	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-
-%-compile: %-prepare
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile
-
-%-install:
-	$(MAKE) -C $(patsubst %-install,%,$@) install
-
-%-clean: FORCE
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
 endif
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+# .IGNORE: $(COMPILE_PACKAGES) 
 
-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-	@$(TOPDIR)/scripts/metadata.pl package_mk $(GENDEP_OPTS) < $< > $@ || rm -f $@
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+	@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
 
 preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
@@ -68,6 +58,9 @@ install:
 			IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
 		done || true \
 	)
+	@-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
+	@-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
+	@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
 
 index: $(PACKAGE_DIR)/Packages