From 1cab294517063a9e40dce04ddf3413ea403088f5 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Mon, 26 May 2008 09:28:28 +0000 Subject: [PATCH] The Contiki 2.x build system allows to define arbitrary macros for the C compiler preprocessor (in other word add -d's to the C compiler command line) directly from the gnumake command line by setting the gnumake variable DEFINES to a comma-seperated list of macros (and optionally values) like this: make TARGET=mytarget DEFINES=MYLOG, MYSIZE=100, MYTRACE The build system does however _NOT_ take care to rebuild things if the DEFINES change so most likely a 'make clean' is advisable. To ease usage the DEFINES may be saved individually per target with the goal 'savedefines' similiar to savinf the target. The 6502-based target leverage the DEFINES mechanism by introducing so-called 'high level config macros' which allow to configure Contiki per target AND per project. Most of the time there's exactly one reasonable set of high level config macros for every combination of target and project. Therefore it makes sense to place them into CVS. --- examples/multi-threading/Makefile.apple2enh.defines | 1 + examples/multi-threading/Makefile.c128.defines | 1 + examples/multi-threading/Makefile.c64.defines | 1 + examples/telnet-server/Makefile.apple2enh.defines | 1 + examples/telnet-server/Makefile.c128.defines | 1 + examples/telnet-server/Makefile.c64.defines | 1 + examples/webbrowser/Makefile.apple2enh.defines | 1 + examples/webbrowser/Makefile.c64.defines | 1 + examples/webserver/Makefile.apple2enh.defines | 1 + examples/webserver/Makefile.c128.defines | 1 + examples/webserver/Makefile.c64.defines | 1 + 11 files changed, 11 insertions(+) create mode 100644 examples/multi-threading/Makefile.apple2enh.defines create mode 100644 examples/multi-threading/Makefile.c128.defines create mode 100644 examples/multi-threading/Makefile.c64.defines create mode 100644 examples/telnet-server/Makefile.apple2enh.defines create mode 100644 examples/telnet-server/Makefile.c128.defines create mode 100644 examples/telnet-server/Makefile.c64.defines create mode 100644 examples/webbrowser/Makefile.apple2enh.defines create mode 100644 examples/webbrowser/Makefile.c64.defines create mode 100644 examples/webserver/Makefile.apple2enh.defines create mode 100644 examples/webserver/Makefile.c128.defines create mode 100644 examples/webserver/Makefile.c64.defines diff --git a/examples/multi-threading/Makefile.apple2enh.defines b/examples/multi-threading/Makefile.apple2enh.defines new file mode 100644 index 000000000..5e74716aa --- /dev/null +++ b/examples/multi-threading/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING diff --git a/examples/multi-threading/Makefile.c128.defines b/examples/multi-threading/Makefile.c128.defines new file mode 100644 index 000000000..5e74716aa --- /dev/null +++ b/examples/multi-threading/Makefile.c128.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING diff --git a/examples/multi-threading/Makefile.c64.defines b/examples/multi-threading/Makefile.c64.defines new file mode 100644 index 000000000..5e74716aa --- /dev/null +++ b/examples/multi-threading/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING diff --git a/examples/telnet-server/Makefile.apple2enh.defines b/examples/telnet-server/Makefile.apple2enh.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/telnet-server/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST diff --git a/examples/telnet-server/Makefile.c128.defines b/examples/telnet-server/Makefile.c128.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/telnet-server/Makefile.c128.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST diff --git a/examples/telnet-server/Makefile.c64.defines b/examples/telnet-server/Makefile.c64.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/telnet-server/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST diff --git a/examples/webbrowser/Makefile.apple2enh.defines b/examples/webbrowser/Makefile.apple2enh.defines new file mode 100644 index 000000000..05a72fd5d --- /dev/null +++ b/examples/webbrowser/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE,WITH_PFS diff --git a/examples/webbrowser/Makefile.c64.defines b/examples/webbrowser/Makefile.c64.defines new file mode 100644 index 000000000..5a292701b --- /dev/null +++ b/examples/webbrowser/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_CLIENT,WITH_DNS,WITH_GUI,WITH_MOUSE diff --git a/examples/webserver/Makefile.apple2enh.defines b/examples/webserver/Makefile.apple2enh.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/webserver/Makefile.apple2enh.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST diff --git a/examples/webserver/Makefile.c128.defines b/examples/webserver/Makefile.c128.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/webserver/Makefile.c128.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST diff --git a/examples/webserver/Makefile.c64.defines b/examples/webserver/Makefile.c64.defines new file mode 100644 index 000000000..a17e2c1c1 --- /dev/null +++ b/examples/webserver/Makefile.c64.defines @@ -0,0 +1 @@ +DEFINES = WITH_LOGGING,WITH_BOOST