diff options
| author | eutarass | 2010-05-15 00:33:48 +0000 |
|---|---|---|
| committer | eutarass | 2010-05-15 00:33:48 +0000 |
| commit | 7a539909ba65b33bf6ad386fa6440e836925d2e0 (patch) | |
| tree | f5cb16b784f63e10f5efb1591afa433196a54258 /Makefile.inc | |
| parent | 3897de73f1382a05ce42ba824de23bd285586827 (diff) | |
| download | org.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.tar.gz org.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.tar.xz org.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.zip | |
TCF Agent: Bug 225082: [tcf][releng] Improve TCF Agent build directory structure:
1. #include statements changed to include directory names, because flat include can easily lead to unwanted name clashes.
2. clients now don't have to add -I to compiler command line for every source directory
3. #include "..." changed to #include <...> to allow substitution of header files by clients.
Diffstat (limited to 'Makefile.inc')
| -rw-r--r-- | Makefile.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc index bf82b88b..6c992fec 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,7 +3,8 @@ CONF = Debug OPSYS = $(shell uname -o 2>/dev/null || uname -s) MACHINE = $(shell uname -m) -SRCDIRS = . system/$(OPSYS) machine/$(MACHINE) system framework services main +INCDIRS = . system/$(OPSYS) machine/$(MACHINE) +SRCDIRS = $(INCDIRS) system framework services main BINDIR = obj/$(OPSYS)/$(MACHINE)/$(CONF) ifeq ($(CONF),Debug) @@ -78,6 +79,6 @@ ifdef SERVICES OPTS += $(shell $(TCF_AGENT_DIR)/bin/services-to-cflags $(SERVICES)) endif -OPTS += $(foreach dir,$(SRCDIRS),-I$(TCF_AGENT_DIR)/$(dir)) +OPTS += $(foreach dir,$(INCDIRS),-I$(TCF_AGENT_DIR)/$(dir)) override CFLAGS += $(OPTS) |