next round of build system cleanup - convert package/ to new structure

[openwrt-10.03/.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 94241dbc3d860c5d875c22ea47789377cf1f7753..31f03c01bbc878e3973f76c148325fa15fc4021f 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -6,52 +6,18 @@
 #
 # $Id$
 
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/.config
-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))
-INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
-
-$(STAMP_DIR) $(TARGET_DIR):
-       mkdir -p $@
-
-ifeq ($(QUIET),1)
-%-compile %-install: FORCE
-       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
-
-%-prepare %-prereq %-download %-clean: FORCE
-else
-%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
-endif
-       $(MAKE) -C $* $(patsubst $*-%,%,$@)
-
-%-refresh %-update:
-       -$(MAKE) -C $* $(patsubst $*-%,%,$@)
-
-
-# .IGNORE: $(COMPILE_PACKAGES) 
-
-$(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: $(COMPILE_PACKAGES)
-ifneq ($(QUILT),)
-  refresh: $(patsubst %,%-refresh,$(package-y) $(package-m) $(package-))
-endif
-
-install-targets: $(INSTALL_PACKAGES)
-install:
+curdir:=package
+
+include .config
+-include $(TMP_DIR)/.packagedeps
+$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
+$(curdir)/builddirs-compile:=$(sort $(package-y) $(package-m))
+$(curdir)/builddirs-install:=. $(sort $(package-y))
+$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+
+$(curdir)//compile:=.config prereq
+$(curdir)/install:=$(curdir)/install-cleanup
+$(curdir)/install-cleanup:
        rm -rf $(BUILD_DIR)/root
        $(MAKE) install-targets
        $(MAKE) preconfig
@@ -70,16 +36,8 @@ install:
        @-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
+$(curdir)/index: FORCE
        (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
-symlinks:
-       ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 
-
-ifeq ($(MAKECMDGOALS),compile)
-MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
-else
-.NOTPARALLEL:
-endif
+$(eval $(call stampfile,$(curdir),package,prereq))
+$(eval $(call subdir,$(curdir)))