X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b4a6c333c073520b05542c6b78a1f81f5a8b6c62..a9ffe1dd47c3c19501ae928a06f956e2259363d3:/package/Makefile?ds=sidebyside

diff --git a/package/Makefile b/package/Makefile
index d21320015..7548e069a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,60 +1,39 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/.config
+include $(TOPDIR)/.pkgdeps
+
 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)
+$(STAMP_DIR) $(TARGET_DIR):
+	mkdir -p $@
 
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
+%-prepare: $(STAMP_DIR) $(TARGET_DIR)
+	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
-$(STAMP_DIR):
-	mkdir -p $@
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+	@echo "-> make $@"
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
 
-$(TARGET_DIR):
-	mkdir -p $(TARGET_DIR)
+%-install: $(STAMP_DIR) $(TARGET_DIR)
+	@echo "-> make $@"
+	$(MAKE) -C $(patsubst %-install,%,$@) install 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)
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+
+
+$(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
+	@$(TOPDIR)/scripts/gen_deps.pl < $< > $@ || rm -f $@
+
+all: compile
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+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