X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/eb1c48aeec6f13addccbc6363f52608fa4d8e322..1bac6cc5d5ab159e292dd61cb57608d1126ad170:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index d2b7468a3..c3fc01c7d 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,10 +8,13 @@
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
-include $(TOPDIR)/.pkgdeps
-include $(TOPDIR)/host.mk
+include $(INCLUDE_DIR)/host.mk
 
-PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-prereq))
+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))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
@@ -19,50 +22,55 @@ 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
-
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+	$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
 
-%-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
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
 endif
+	$(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-$(TOPDIR)/.pkgdeps: $(TOPDIR)/.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)
-compile-targets: $(COMPILE_PACKAGES)
-compile:
-	$(MAKE) compile-targets
-install-targets: base-files-install $(INSTALL_PACKAGES)
+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
+	@( \
+		cd $(BUILD_DIR)/root; \
+		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 || 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
 
 $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
 	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
+symlinks:
+	../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 
 
-ifeq ($(MAKECMDGOALS),compile-targets)
+ifeq ($(MAKECMDGOALS),compile)
 MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
 else
 .NOTPARALLEL: