X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/19b6ad06f6f8554a3804ac70b473764ab0498d94..d002d70af78bd86328f64c9078799808de84fd6e:/openwrt/Makefile diff --git a/openwrt/Makefile b/openwrt/Makefile index 3d9bcb387..d47822752 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,6 +1,6 @@ # Makefile for OpenWRT # -# Copyright (C) 2005 by Felix Fietkau +# Copyright (C) 2005 by Felix Fietkau # Copyright (C) 1999-2004 by Erik Andersen # # This program is free software; you can redistribute it and/or modify @@ -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,22 +45,7 @@ include $(TOPDIR)/rules.mk all: world -############################################################## -# -# Build the toolchain -# -############################################################## -toolchain_install: - $(MAKE) -C toolchain install - -############################################################## -# -# Make all packages -# -############################################################## - -package_install: toolchain - $(MAKE) -C package compile install +.NOTPARALLEL: ############################################################# # @@ -65,13 +54,12 @@ package_install: toolchain # ############################################################# - # In this section, we need .config include .config.cmd -world: $(DL_DIR) $(BUILD_DIR) configtest target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index +world: $(DL_DIR) $(BUILD_DIR) configtest toolchain/install target/compile package/compile target/install package_index -.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install configtest +.PHONY: all world clean dirclean distclean image_clean target_clean source configtest configtest: -cp .config .config.test @@ -82,12 +70,6 @@ package_index: $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \ ) -target_prepare: - $(MAKE) -C target prepare - -target_install: - $(MAKE) -C target install - $(DL_DIR): @mkdir -p $(DL_DIR) @@ -96,6 +78,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 @@ -107,7 +99,7 @@ image_clean: rm -rf $(BIN_DIR) target_clean: image_clean - rm -rf $(TARGET_DIR) + rm -rf $(BUILD_DIR)/linux-*/root clean: target_clean @$(MAKE) -C $(CONFIG) clean @@ -169,8 +161,6 @@ randconfig: $(CONFIG)/conf -./scripts/configtest.pl allyesconfig: $(CONFIG)/conf - #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN) - #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config -touch .config -cp .config .config.test @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)