X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9d30652149fd745711342cec7ee8574e973ec241..3d007394805916ceb2214bfd7e06d8a4899262c5:/openwrt/Makefile

diff --git a/openwrt/Makefile b/openwrt/Makefile
index ed4ea1529..45a9ba7ff 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -24,7 +24,11 @@
 #--------------------------------------------------------------
 TOPDIR=${shell pwd}
 export TOPDIR
+ifneq ($(DEVELOPER),)
+CONFIG_CONFIG_IN = Config.in.devel
+else
 CONFIG_CONFIG_IN = Config.in
+endif
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
@@ -41,6 +45,8 @@ include $(TOPDIR)/rules.mk
 
 all: world
 
+.NOTPARALLEL:
+
 ##############################################################
 #
 # Build the toolchain
@@ -55,8 +61,11 @@ toolchain_install:
 #
 ##############################################################
 
-package_install: toolchain
-	$(MAKE) -C package compile install
+package_compile: target_compile
+	$(MAKE) -C package compile
+
+package_install: package_compile toolchain
+	$(MAKE) -C package install
 
 #############################################################
 #
@@ -65,22 +74,24 @@ package_install: toolchain
 #
 #############################################################
 
-
 # In this section, we need .config
 include .config.cmd
 
-world: $(DL_DIR) $(BUILD_DIR) target_prepare $(TARGET_DIR) toolchain_install package_install target_install
+world: $(DL_DIR) $(BUILD_DIR) configtest toolchain_install package_install target_install package_index
 
-.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install
+.PHONY: all world clean dirclean distclean image_clean target_clean source target_install toolchain_install package_install configtest
 
-#############################################################
-#
-# staging and target directories do NOT list these as
-# dependancies anywhere else
-#
-#############################################################
-target_prepare:
-	$(MAKE) -C target prepare
+configtest:
+	-cp .config .config.test
+	-scripts/configtest.pl
+
+package_index:
+	(cd $(PACKAGE_DIR); \
+		$(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
+	)
+
+target_compile:
+	$(MAKE) -C target compile
 
 target_install:
 	$(MAKE) -C target install
@@ -93,6 +104,16 @@ $(BUILD_DIR):
 
 source: $(TARGETS_SOURCE)
 
+
+package/%:
+	$(MAKE) -C package $(patsubst package/%,%,$@)
+
+target/%:
+	$(MAKE) -C target $(patsubst target/%,%,$@)
+
+toolchain/%:
+	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+
 #############################################################
 #
 # Cleanup and misc junk
@@ -105,18 +126,16 @@ image_clean:
 	
 target_clean: image_clean
 	rm -rf $(TARGET_DIR)
+	rm -rf $(BUILD_DIR)/linux-*/root
 
 clean: target_clean
 	@$(MAKE) -C $(CONFIG) clean
 
 dirclean: clean
-	rm -rf $(STAMP_DIR)
-	$(MAKE) -C package clean
-	$(MAKE) -C target clean
 	rm -rf $(BUILD_DIR)
 
 distclean: clean
-	rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR)
+	rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
 	rm -f .config* .tmpconfig.h
 
 sourceball: distclean