diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2012-07-07 12:27:21 -0500 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2012-07-07 17:01:48 -0500 |
| commit | e6c9d3d996bd55e7ab14dbd74deb7841e0c3a4f1 (patch) | |
| tree | f0cc415efaf79053d5afae9fda206fbc43caba30 | |
| parent | 6773fa9d6276312d1190c46d00e4504fbfec6d8c (diff) | |
| download | agent-proxy-e6c9d3d996bd55e7ab14dbd74deb7841e0c3a4f1.tar.gz | |
Makefile: Move AGENT_VER to out of CC= for simple cross compileagent-proxy-1.96
When using a system such as bitbake, it provides its own CC=
and we should not assume they will also force set the
version of the agent-proxy.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -6,7 +6,7 @@ # Original design by Jason Wessel # ############################################################################ -AGENTVER=1.95 +AGENTVER=1.96 ifeq ($(shell uname -s),Linux) OSTYPE := linux @@ -32,14 +32,14 @@ endif ifeq ($(ARCH),) CFLAGS = /GZ /Z7 /MTd -DDEBUG -nologo LINKFLAGS = -CC = cl -DAGENT_VER=$(AGENTVER) +CC = cl #Change .o to .obj OBJS:=$(patsubst %.o,%.obj,$(OBJS)) TLSPATH_INC=-I T:/rome_tls/x86-win/encap/sdk0204/include ## Unix Options ## else CFLAGS = -g -Wall -Wno-unused-parameter -D$(ARCH) -CC = $(CROSS_COMPILE)gcc -DAGENT_VER=$(AGENTVER) +CC = $(CROSS_COMPILE)gcc AGENTPROXY = $(CROSS_COMPILE)agent-proxy endif @@ -48,10 +48,10 @@ all: $(CROSS_COMPILE)agent-proxy ## Build for win32 or unix ifeq ($(ARCH),) $(CROSS_COMPILE)agent-proxy: $(OBJS) - $(CC) $(LINKFLAGS) $(CFLAGS) -o $(extpath)$@ $(OBJS) wsock32.lib + $(CC) -DAGENT_VER=$(AGENTVER) $(LINKFLAGS) $(CFLAGS) -o $(extpath)$@ $(OBJS) wsock32.lib else $(CROSS_COMPILE)agent-proxy: $(OBJS) - $(CC) $(CFLAGS) -o $(extpath)$@ $(OBJS) $(LDLIBS) + $(CC) -DAGENT_VER=$(AGENTVER) $(CFLAGS) -o $(extpath)$@ $(OBJS) $(LDLIBS) endif @@ -61,9 +61,9 @@ clean: rm -f $(extpath)$(CROSS_COMPILE)agent-proxy $(extpath)agent-proxy $(extpath)*.o $(extpath)*.obj $(extpath)*.exp $(extpath)*.exe $(extpath)*.ilk $(extpath)*.pdb *~ $(extpath)$(CROSS_COMPILE)%.o::%.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) -DAGENT_VER=$(AGENTVER) $(CFLAGS) -c $< -o $@ $(extpath)%.obj:%.c - $(CC) $(CFLAGS) -c -Fo$@ $(TLSPATH_INC) $< + $(CC) -DAGENT_VER=$(AGENTVER) $(CFLAGS) -c -Fo$@ $(TLSPATH_INC) $< |