X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a74795a1055303f96e614b616ad54f5ccc0c0c6f..052dece811fc6f676805bf7625c24ff34d36d23e:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index 7548e069a..304343a2a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,39 +1,69 @@
-# Main makefile for the packages
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
 include $(TOPDIR)/.pkgdeps
+include $(INCLUDE_DIR)/host.mk
 
+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))
 
 $(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 MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
 
 %-install: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
-	$(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+	$(MAKE) -C $(patsubst %-install,%,$@) install
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
+ifeq ($(SDK),1)
+GENDEP_OPTS := -s
+endif
 
 $(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
-	@$(TOPDIR)/scripts/gen_deps.pl < $< > $@ || rm -f $@
+	@$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
 
 all: compile
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+prereq: $(PREREQ_PACKAGES)
+download: $(DOWNLOAD_PACKAGES)
 compile-targets: $(COMPILE_PACKAGES)
 compile:
-	$(MAKE) -j$(CONFIG_JLEVEL) compile-targets
+	$(MAKE) compile-targets
 install-targets: base-files-install $(INSTALL_PACKAGES)
 install:
 	rm -rf $(BUILD_DIR)/root
 	$(MAKE) install-targets
 
+index: $(PACKAGE_DIR)/Packages
+
+$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
+	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+
+
+ifeq ($(MAKECMDGOALS),compile-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif