fixes for common config functions

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index d213200..4b924a3 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,60 +1,45 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/.config
+include $(TOPDIR)/.pkgdeps
+
+SOURCE_PACKAGES:=$(patsubst %,%-source,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
-all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-compile: $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
-
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
-
-$(STAMP_DIR):
+$(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
-$(TARGET_DIR):
-       mkdir -p $(TARGET_DIR)
+%-source: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-source,%,$@) source MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-compile:
-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
-                       touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-install: %-compile
-       @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
-       @$(MAKE) -C $(patsubst %-install,%,$@) install
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
-
-%-rebuild: 
-       @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
-       @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
-
-%-clean:
-       @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+
+%-install: $(STAMP_DIR) $(TARGET_DIR)
+       $(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)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
+
+all: compile
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+download: $(SOURCE_PACKAGES)
+compile-targets: $(COMPILE_PACKAGES)
+compile:
+       $(MAKE) -j$(CONFIG_JLEVEL) compile-targets
+install-targets: base-files-install $(INSTALL_PACKAGES)
+install:
+       rm -rf $(BUILD_DIR)/root
+       $(MAKE) install-targets