Simplify toplevel Makefile

diff --git a/Makefile b/Makefile
index 82335d6a6f289d7fa585f726880fa49a6576eea2..04f04c79f91724a436c6dfd31bc0f65a3e14c215 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 HELP=""
 include .conf.mk
-include .stamp/empty
+include .stamp/empty # This creates the .stamp directory
+
+HELPER_PROGRAMS = scripts/parse_kconfig/parse          \
+                 scripts/write_config/write_config     \
+                 scripts/allconfig/allconfig           \
+                 scripts/picosat-959/picosat
 
 HELP+="all         - Builds basic programs and prints message about next steps.\n"
 .PHONY: all
-all: parse_kconfig write_config allconfig picosat .stamp/initram_cyclictest
+all:  $(HELPER_PROGRAMS) .stamp/initram_cyclictest
 
 .PHONY: help
 help:
@@ -26,7 +31,7 @@ HELP+="              configuration.\n"
 mlinux:
        ARCH=$(CONF_KERNEL_ARCH) $(MAKE) -C $(CONF_LINUX_SOURCES) menuconfig
 
-HELP+="deflinux    - Executes 'make menuconfig' in linux folder. This generates default\n"
+HELP+="deflinux    - Executes 'make defconfig' in linux folder. This generates default\n"
 HELP+="              linux configuration.\n"
 .PHONY: deflinux
 deflinux:
@@ -34,7 +39,7 @@ deflinux:
 
 HELP+="dot_config  - Generate dot_config file. This file is based on default Linux\n"
 HELP+="              configuration.\n"
-dot_config: allconfig
+dot_config: scripts/allconfig/allconfig
        cd $(CONF_LINUX_SOURCES) && \
                SRCARCH=$(CONF_KERNEL_ARCH) \
                ARCH=$(CONF_KERNEL_ARCH) \
@@ -59,7 +64,7 @@ HELP+="              target run. This target is for testing if initial kernel\n"
 HELP+="              configuration, buildroot configuration and benchmark are\n"
 HELP+="              configured right.\n"
 .PHONY: test
-test: parse_kconfig .stamp/initram_cyclictest
+test: scripts/parse_kconfig/parse .stamp/initram_cyclictest
        scripts/test.py
 
 HELP+="run         - Executes loop of kernel building, booting and benchmark execution.\n"
@@ -130,27 +135,13 @@ distclean_buildroot:
 .target:
        $(error Please select target by writing it to .target file)
 
-.PHONY: parse_kconfig
-parse_kconfig:
-       @if ! $(MAKE) -C scripts/parse_kconfig/ -q; then \
-       $(MAKE) -C scripts/parse_kconfig/; fi
-
-.PHONY: write_config
-write_config:
-       @if ! $(MAKE) -C scripts/write_config/ -q; then \
-       $(MAKE) -C scripts/write_config/; fi
-
-.PHONY:allconfig
-allconfig:
-       @if ! $(MAKE) -C scripts/allconfig/ -q; then \
-       $(MAKE) -C scripts/allconfig/; fi
-
-.PHONY: picosat
-picosat:
-       @if [ ! -e scripts/picosat-959/makefile ]; then \
-       cd scripts/picosat-959 && ./configure; fi
-       @if ! $(MAKE) -C scripts/picosat-959 -q; then \
-       $(MAKE) -C scripts/picosat-959; fi
+$(HELPER_PROGRAMS):
+       $(MAKE) -C $(dir $@)
+
+scripts/picosat-959/makefile:
+       cd $(dir $@) && ./configure
+
+scripts/picosat-959/picosat: scripts/picosat-959/makefile
 
 .stamp/initram_cyclictest: .conf.mk
        $(MAKE) -C tests/cyclictest/root