diff options
| author | eutarass | 2010-05-15 00:33:48 +0000 |
|---|---|---|
| committer | eutarass | 2010-05-15 00:33:48 +0000 |
| commit | f5024da3e3801ec6487ff486a1bd518ca07ce9db (patch) | |
| tree | 195d54c047ff031e2a48cf1520f37a96fb8990b5 /examples | |
| parent | c19a2f05f16f87ceee54dd848fd5f503a5ecbebb (diff) | |
| download | org.eclipse.tcf-f5024da3e3801ec6487ff486a1bd518ca07ce9db.tar.gz org.eclipse.tcf-f5024da3e3801ec6487ff486a1bd518ca07ce9db.tar.xz org.eclipse.tcf-f5024da3e3801ec6487ff486a1bd518ca07ce9db.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 'examples')
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/org.eclipse.tm.tcf.examples.daytime.agent/Makefile b/examples/org.eclipse.tm.tcf.examples.daytime.agent/Makefile index 5f544787f..0d7a685d2 100644 --- a/examples/org.eclipse.tm.tcf.examples.daytime.agent/Makefile +++ b/examples/org.eclipse.tm.tcf.examples.daytime.agent/Makefile @@ -2,7 +2,7 @@ TCF_AGENT_DIR=../../agent include $(TCF_AGENT_DIR)/Makefile.inc -override CFLAGS := $(foreach dir,$(SRCDIRS),-I$(dir)) $(CFLAGS) +override CFLAGS := $(foreach dir,$(INCDIRS),-I$(dir)) $(CFLAGS) HFILES := $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.h)) $(HFILES) CFILES := $(sort $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.c)) $(CFILES)) diff --git a/examples/org.eclipse.tm.tcf.examples.daytime.agent/config.h b/examples/org.eclipse.tm.tcf.examples.daytime.agent/config.h index b97f7356e..2968d5593 100644 --- a/examples/org.eclipse.tm.tcf.examples.daytime.agent/config.h +++ b/examples/org.eclipse.tm.tcf.examples.daytime.agent/config.h @@ -23,7 +23,7 @@ #ifndef D_config #define D_config -#include "mdep.h" +#include <framework/mdep.h> #if defined(WIN32) || defined(__CYGWIN__) # define TARGET_UNIX 0 diff --git a/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.c b/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.c index 55571e2eb..35862148f 100644 --- a/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.c +++ b/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.c @@ -16,12 +16,12 @@ * Sample TCF service implementation. */ -#include "config.h" +#include <config.h> #include <time.h> -#include "daytime.h" -#include "json.h" -#include "errors.h" -#include "exceptions.h" +#include <framework/json.h> +#include <framework/errors.h> +#include <framework/exceptions.h> +#include <daytime.h> static const char * DAYTIME = "Daytime"; diff --git a/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.h b/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.h index 12645d267..0321adf5c 100644 --- a/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.h +++ b/examples/org.eclipse.tm.tcf.examples.daytime.agent/daytime.h @@ -19,8 +19,8 @@ #ifndef DAYTIME_H_ #define DAYTIME_H_ -#include "mdep.h" -#include "protocol.h" +#include <config.h> +#include <framework/protocol.h> extern void ini_daytime_service(Protocol * proto); |