more build system cleanup

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 35fc2c8..92b84bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,161 +7,38 @@
 # See /LICENSE for more information.
 #
 
 # See /LICENSE for more information.
 #
 

-RELEASE:=Kamikaze
-#VERSION:=2.0 # uncomment for final release
-
-#--------------------------------------------------------------
-# Just run 'make menuconfig', configure stuff, then run 'make'.
-# You shouldn't need to mess with anything beyond this point...
-#--------------------------------------------------------------
-

 all: world
 
 all: world
 

-SHELL:=/usr/bin/env bash
-export LC_ALL=C
-export LANG=C
-export TOPDIR=${CURDIR}
-ifeq ($(KBUILD_VERBOSE),99)
-  MAKE:=3>/dev/null $(MAKE)
-endif
-export IS_TTY=$(shell tty -s && echo 1 || echo 0)
-
-include $(TOPDIR)/include/verbose.mk
-
-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
-else
-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
-endif
-export OPENWRTVERSION
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-
-ifeq ($(FORCE),)
-  .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages tmp/.prereq-target
-endif
-
-ifeq ($(IS_TTY),1)
-  define progress
-       printf "\033[M\r$(1)" >&2;
-  endef
-endif
-
-define dumpinfo
-       @mkdir -p tmp
-       @echo -n Collecting $(2) info... 
-       @-for dir in $(1)/*/; do \
-               [ -f "$${dir}/Makefile" ] || continue; \
-               $(call progress,Collecting $(2) info: $${dir%%/}) \
-               echo Source-Makefile: $${dir}Makefile; \
-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-               echo; \
-       done > $@
-       @($(call progress,Collecting $(2) info: done))
-       @echo
-endef
-
-tmp/.pkginfo:
-       $(call dumpinfo,package,package)
-
-tmp/.targetinfo:
-       $(call dumpinfo,target/linux,target)
-
-tmpinfo-clean: FORCE
-       @-rm -rf tmp/.pkginfo tmp/.targetinfo
-
-tmp/.config.in: tmp/.pkginfo
-       @./scripts/metadata.pl package_config < $< > $@ || rm -f $@
-
-tmp/.config-target.in: tmp/.targetinfo
-       @./scripts/metadata.pl target_config < $< > $@ || rm -f $@
-
-.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       @$< -D .config Config.in &> /dev/null
-
-scripts/config/mconf:
-       @$(MAKE) -C scripts/config all
-
-scripts/config/conf:
-       @$(MAKE) -C scripts/config conf
-
-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-       $< Config.in

 
 

-config-clean: FORCE
-       $(NO_TRACE_MAKE) -C scripts/config clean
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+IS_TTY:=${shell tty -s && echo 1 || echo 0}
+export TOPDIR LC_ALL LANG IS_TTY

 
 

-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-       touch .config
-       $< -D .config Config.in
+include rules.mk

 
 

-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
-       $< -o Config.in
-
-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
-       $< Config.in
-
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
-
-tools/%: FORCE
-       $(MAKE) -C tools $(patsubst tools/%,%,$@)
-
-toolchain/%: tmp/.targetinfo FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
-
-tmp/.prereq-build: include/prereq-build.mk
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
+ifneq ($(OPENWRT_BUILD),1)
+  export OPENWRT_BUILD:=1
+  include $(INCLUDE_DIR)/toplevel.mk
+else
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include tools/Makefile

 
 

-tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
+clean: FORCE
+       rm -rf build_* bin tmp

 
 

-tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
+dirclean: clean
+       rm -rf staging_dir_* toolchain_build_* tool_build

 
 

-prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
+distclean: dirclean config-clean symlinkclean docs/clean
+       rm -rf dl

 
 

-download: .config FORCE
-       $(MAKE) tools/download
-       $(MAKE) toolchain/download
-       $(MAKE) package/download
-       $(MAKE) target/download
+toolchain/% package/% target/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*

 
 

-world: .config FORCE
-       $(MAKE) tools/install
+world: .config $(tools/stamp) FORCE

        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile


@@ -169,25 +46,4 @@ world: .config FORCE
        $(MAKE) target/install
        $(MAKE) package/index
 
        $(MAKE) target/install
        $(MAKE) package/index
 

-clean: FORCE
-       rm -rf build_* bin tmp
-
-dirclean: clean
-       rm -rf staging_dir_* toolchain_build_* tool_build
-
-distclean: dirclean config-clean
-       rm -rf dl
-
-help:
-       cat README
-
-doc:
-       $(MAKE) -C docs/ openwrt.pdf
-
-docclean:
-       $(MAKE) -C docs/ clean
-
-.SILENT: clean dirclean distclean config-clean download world
-FORCE: ;
-.PHONY: FORCE help
-%: ;
+endif