X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3e032c51feb1678d9fe2ff1c5570135f3da40da4..622ea9fa13bf212e52c04602112ee1117a863af9:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index ff7075d41..9b8f87292 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,43 +22,27 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-prereq,%,$@) prereq
-
-%-download: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+%-prereq %-download %-clean %-compile %-install: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile
-
-%-install: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-install,%,$@) install
-
-%-clean: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
-endif
+%-prereq: $(STAMP_DIR) $(TARGET_DIR)
+%-prepare: $(TARGET_DIR)
+%-compile: %-prepare
 
-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-	@$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+	@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
 
-all: compile
+preconfig:
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 prereq: $(PREREQ_PACKAGES)
 download: $(DOWNLOAD_PACKAGES)
-compile-targets: $(COMPILE_PACKAGES)
-compile:
-	$(MAKE) compile-targets
+compile: $(COMPILE_PACKAGES)
 
 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
@@ -64,7 +51,7 @@ 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 \
 	)
 
 index: $(PACKAGE_DIR)/Packages
@@ -75,7 +62,7 @@ $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
 symlinks:
 	../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 
 
-ifeq ($(MAKECMDGOALS),compile-targets)
+ifeq ($(MAKECMDGOALS),compile)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
 else
 .NOTPARALLEL: