fix typo

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 7a3af2e..b9392c0 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -10,27 +10,31 @@ include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
 include $(TOPDIR)/.pkgdeps
 
 include $(TOPDIR)/.config
 include $(TOPDIR)/.pkgdeps
 

-SOURCE_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
+PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-y) $(package-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 $@
 
 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)
 %-download: $(STAMP_DIR) $(TARGET_DIR)

-       $(MAKE) -C $(patsubst %-download,%,$@) download MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+       $(MAKE) -C $(patsubst %-download,%,$@) download

 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)

-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare

 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)

-       $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+       $(MAKE) -C $(patsubst %-compile,%,$@) compile

 
 %-install: $(STAMP_DIR) $(TARGET_DIR)
 
 %-install: $(STAMP_DIR) $(TARGET_DIR)

-       $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+       $(MAKE) -C $(patsubst %-install,%,$@) install

 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)

-       $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+       $(MAKE) -C $(patsubst %-clean,%,$@) clean

 
 ifeq ($(SDK),1)
 GENDEP_OPTS := -s
 
 ifeq ($(SDK),1)
 GENDEP_OPTS := -s


@@ -41,12 +45,24 @@ $(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
 
 all: compile
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 
 all: compile
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))

-download: $(SOURCE_PACKAGES)
+prereq: $(PREREQ_PACKAGES)
+download: $(DOWNLOAD_PACKAGES)

 compile-targets: $(COMPILE_PACKAGES)
 compile:
 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
 
 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); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
+
+
+ifeq ($(MAKECMDGOALS),compile-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif