X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/02059e7283fa828bb98a52754ec6d9019e858bf0..6e1353be006d8bc561a2d801602f86d74a1a6980:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index 151942de3..c3fc01c7d 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,9 +8,12 @@
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
-include $(TMP_DIR)/.pkgdeps
 include $(INCLUDE_DIR)/host.mk
 
+all: compile
+
+include $(TMP_DIR)/.packagedeps
+
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
@@ -19,19 +22,22 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-prereq,%,$@) prereq
-
-$(eval $(call default_subtargets,$(TARGET_DIR)))
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
 
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
 endif
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-	@$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
+# .IGNORE: $(COMPILE_PACKAGES) 
 
-all: compile
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+	@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
+
+preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 prereq: $(PREREQ_PACKAGES)
 download: $(DOWNLOAD_PACKAGES)
@@ -41,6 +47,7 @@ install-targets: $(INSTALL_PACKAGES)
 install:
 	rm -rf $(BUILD_DIR)/root
 	$(MAKE) install-targets
+	$(MAKE) preconfig
 	@if [ -d $(TOPDIR)/files ]; then \
 		$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
 	fi
@@ -49,8 +56,11 @@ install:
 		for script in ./etc/init.d/*; do \
 			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
 			IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
-		done; \
+		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