remove debug line

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 2b7f0db..c2015b3 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,39 +1,52 @@
-# 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 $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
 include $(TOPDIR)/.pkgdeps
 

-SOURCE_PACKAGES:=$(patsubst %,%-source,$(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 $@
 

-%-source: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-source,%,$@) source MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+%-prereq: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+
+%-download: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-download,%,$@) download MAKEFLAGS="$(BUILD_MAKEFLAGS)"

 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)

-       @echo "-> make $@"

        $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-install: $(STAMP_DIR) $(TARGET_DIR)
        $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-install: $(STAMP_DIR) $(TARGET_DIR)

-       @echo "-> make $@"

        $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
        $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
        $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
        $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 

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

 
 $(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
 
 $(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))
 
 all: compile
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))

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

 compile-targets: $(COMPILE_PACKAGES)
 compile:
        $(MAKE) -j$(CONFIG_JLEVEL) compile-targets
 compile-targets: $(COMPILE_PACKAGES)
 compile:
        $(MAKE) -j$(CONFIG_JLEVEL) compile-targets


@@ -42,3 +55,8 @@ install:
        rm -rf $(BUILD_DIR)/root
        $(MAKE) install-targets
 
        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)
+