Updated makefiles for more consistency

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/makefile b/boards/hcs12_elmicro_card12/examples/blinker/makefile
index ec637949547afa03ad48cce46be394ef7c6f7169..d7c387422930ff7417194a6e22abb6ef85be0042 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/makefile
+++ b/boards/hcs12_elmicro_card12/examples/blinker/makefile
@@ -1,13 +1,16 @@
 \r
 \r
-EXAMPLENAME=blinker\r
+PROJECTNAME=blinker\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += Tasks.o\r
+       # object files\r
+       obj-y += Tasks.o\r
+\r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/hcs12_elmicro_card12/examples/os_simple/makefile b/boards/hcs12_elmicro_card12/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/os_simple/makefile
+++ b/boards/hcs12_elmicro_card12/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/makefile b/boards/hcs12x_elmicro_tboard/examples/ledmaster/makefile
index 19c237cf5d7333fb05637cf62e8ff0496471578a..d31511d15c68de43a3ea1b19bf83354591e968e0 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/makefile
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/makefile
@@ -1,13 +1,16 @@
 \r
 \r
-EXAMPLENAME=ledmaster\r
+PROJECTNAME=ledmaster\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += Tasks.o\r
+       # object files\r
+       obj-y += Tasks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/os_simple/makefile b/boards/hcs12x_elmicro_tboard/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/os_simple/makefile
+++ b/boards/hcs12x_elmicro_tboard/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/mpc5516it/examples/os_simple/makefile b/boards/mpc5516it/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/mpc5516it/examples/os_simple/makefile
+++ b/boards/mpc5516it/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/mpc551xsim/examples/os_kernel_extra/makefile b/boards/mpc551xsim/examples/os_kernel_extra/makefile
index dbf8822a43bd613170a34753dd4a5aa19698b27d..439507466591223e2b1010790603847cb29fb6e0 100644 (file)
--- a/boards/mpc551xsim/examples/os_kernel_extra/makefile
+++ b/boards/mpc551xsim/examples/os_kernel_extra/makefile
@@ -1,13 +1,16 @@
 \r
-EXAMPLENAME=kernel_extra\r
+PROJECTNAME=kernel_extra\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += system_hooks.o\r
-obj-y += os_kernel_extra.o\r
+       # object files\r
+       obj-y += system_hooks.o\r
+       obj-y += os_kernel_extra.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif   \r
         \r

diff --git a/boards/mpc551xsim/examples/os_schtbl/makefile b/boards/mpc551xsim/examples/os_schtbl/makefile
index 7656fd08d8bb617841272188414a1bdb93eb6bc3..e920f3adbf6fb94ae35833e87778da3aa302b058 100644 (file)
--- a/boards/mpc551xsim/examples/os_schtbl/makefile
+++ b/boards/mpc551xsim/examples/os_schtbl/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=schedule_table\r
+PROJECTNAME=schedule_table\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_schtbl.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_schtbl.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/mpc551xsim/examples/os_simple/makefile b/boards/mpc551xsim/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/mpc551xsim/examples/os_simple/makefile
+++ b/boards/mpc551xsim/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/mpc5567qrtech/examples/os_simple/makefile b/boards/mpc5567qrtech/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/mpc5567qrtech/examples/os_simple/makefile
+++ b/boards/mpc5567qrtech/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/mpc5606s_xpc560s/examples/os_simple/makefile b/boards/mpc5606s_xpc560s/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/mpc5606s_xpc560s/examples/os_simple/makefile
+++ b/boards/mpc5606s_xpc560s/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/stm32_stm3210c/examples/os_simple/makefile b/boards/stm32_stm3210c/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/makefile
+++ b/boards/stm32_stm3210c/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/ti_tms570ls/examples/os_simple/makefile b/boards/ti_tms570ls/examples/os_simple/makefile
index 7eb8ed5eee7927c5ad29e37fd87c19f1bac4b1f9..f56d821f5592a6ddd814a6cccee2cf22f6bb6fca 100644 (file)
--- a/boards/ti_tms570ls/examples/os_simple/makefile
+++ b/boards/ti_tms570ls/examples/os_simple/makefile
@@ -1,14 +1,17 @@
 \r
 \r
-EXAMPLENAME=os_simple\r
+PROJECTNAME=os_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-obj-y += os_simple.o\r
-obj-y += system_hooks.o\r
+       # object files\r
+       obj-y += os_simple.o\r
+       obj-y += system_hooks.o\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/boards/ti_tms570ls/examples/rte_simple/makefile b/boards/ti_tms570ls/examples/rte_simple/makefile
index e66df0d1a44eb00fce7eec7653a20adc25cc74be..f8686b0d13e4e8c026fca1920caebbb91487b348 100644 (file)
--- a/boards/ti_tms570ls/examples/rte_simple/makefile
+++ b/boards/ti_tms570ls/examples/rte_simple/makefile
@@ -1,15 +1,18 @@
 \r
 \r
-EXAMPLENAME=rte_simple\r
+PROJECTNAME=rte_simple\r
 ROOTDIR?=../../../..\r
-include $(ROOTDIR)/examples/build_example.mk\r
+include $(ROOTDIR)/scripts/project_defaults.mk\r
 include $(ROOTDIR)/examples/rte_simple/rte_simple.mk\r
 \r
 ifneq (${MAKELEVEL},0) \r
 \r
-# object files\r
-PROJECT_C_FILES=$(notdir $(wildcard ../*.c))\r
-obj-y += $(PROJECT_C_FILES:%.c=%.o)\r
+       # object files\r
+       PROJECT_C_FILES=$(notdir $(wildcard ../*.c))\r
+       obj-y += $(PROJECT_C_FILES:%.c=%.o)\r
+       \r
+       VPATH += $(ROOTDIR)/examples\r
+       VPATH += $(ROOTDIR)/examples/$(PROJECTNAME)\r
 \r
 endif\r
 \r

diff --git a/scripts/project_defaults.mk b/scripts/project_defaults.mk
index e1435655b5e261e1ee480d03f206cf033e53db37..137d4002e2ebe561fb0506325eb1a2a23356045a 100644 (file)
--- a/scripts/project_defaults.mk
+++ b/scripts/project_defaults.mk
@@ -1,32 +1,56 @@
 #\r
-# This makefile helps to build the examples. It tries to figure out if \r
+# Default build settings. Included in project makefile\r
+#\r
+# This makefile also helps to build the examples. It tries to figure out if \r
 # it is an in-tree-build or if it is a seperate project (it's then invoked \r
 # from the top makefile)  \r
 #\r
 \r
-ifndef EXAMPLENAME\r
-$(error EXAMPLENAME is not set. . This makefile is invoked the wrong way))\r
+ifndef PROJECTNAME\r
+$(error PROJECTNAME is not set. . This makefile is invoked the wrong way))\r
 endif\r
 \r
 ifndef ROOTDIR\r
 $(error ROOTDIR is not set. This makefile is invoked the wrong way)\r
 endif\r
 \r
-ifeq (${MAKELEVEL},0)\r
-BUILD_IN_TREE=y\r
+ifneq (${MAKELEVEL},0)\r
+\r
+#####################################################################\r
+# Default settings\r
+#####################################################################\r
+\r
+       VPATH += ..\r
+       inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+       inc-y += $(ROOTDIR)/system/kernel/include\r
+       \r
+       # The more precise configuration, the higher preceedance.\r
+       VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+       inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+\r
+       ldcmdfile-y = linkscript_$(COMPILER).lcf\r
+       vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+\r
+       # What I want to build\r
+       build-exe-y = $(PROJECTNAME).elf\r
+\r
+\r
+else\r
+\r
+#####################################################################\r
+# In-tree-build (for examples)\r
+#####################################################################\r
 \r
+       BUILD_IN_TREE=y\r
     ifneq ($(BOARDDIR),)\r
     $(warning BOARDDIR defined in an in-tree-build)\r
     endif\r
 \r
+       # Try to get name of board\r
     boardpath=$(realpath $(CURDIR)/../..)\r
     boarddir=$(subst $(realpath $(ROOTDIR)/boards)/,,$(boardpath))\r
-endif\r
-\r
-ifeq (${BUILD_IN_TREE},y) \r
-\r
-export example:=$(subst $(abspath $(CURDIR)/..)/,,$(CURDIR))\r
 \r
+       # Redirect to normal build\r
 .PHONY: all clean\r
 all:\r
        @echo "==========[ Building \"$(example)\" ]=========="\r
@@ -37,24 +61,5 @@ clean:
        $(Q)rm -rf obj_$(boarddir)\r
        @echo done!\r
 \r
-else \r
-export example:=$(EXAMPLENAME)\r
-endif\r
-\r
-ifneq (${MAKELEVEL},0)\r
-\r
-VPATH += ..\r
-VPATH += ../config\r
-VPATH += $(ROOTDIR)/examples\r
-VPATH += $(ROOTDIR)/examples/$(example)\r
-inc-y += ..\r
-inc-y += ../config\r
-\r
-ldcmdfile-y = linkscript_$(COMPILER).lcf\r
-vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
-       \r
-# What I want to build\r
-build-exe-y = $(EXAMPLENAME).elf\r
-\r
 endif\r
 \r