Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2011-11-10 20:55:47 -0500
committerEugene Tarassov2011-11-10 20:55:47 -0500
commit19a30afac70c4b5507833c990bd160a9731f6eda (patch)
tree8d0ae4b3f25715a7b1add26a2a04e4633bbc8194
parent846c7264e3daaebb87dc9ab959bbfd2472abfd0e (diff)
downloadorg.eclipse.tcf.agent-19a30afac70c4b5507833c990bd160a9731f6eda.tar.gz
org.eclipse.tcf.agent-19a30afac70c4b5507833c990bd160a9731f6eda.tar.xz
org.eclipse.tcf.agent-19a30afac70c4b5507833c990bd160a9731f6eda.zip
Fixed agent and server makefiles.
-rw-r--r--agent/Makefile29
-rw-r--r--agent/Makefile.inc18
-rw-r--r--agent/tcf/machine/i386/cpudefs-mdep.h2
-rw-r--r--agent/tcf/machine/i686/cpudefs-mdep.h2
-rw-r--r--server/Makefile6
5 files changed, 28 insertions, 29 deletions
diff --git a/agent/Makefile b/agent/Makefile
index bdb8a946..70929cef 100644
--- a/agent/Makefile
+++ b/agent/Makefile
@@ -54,30 +54,30 @@ $(LIBTCF) : $(OFILES)
$(AR) $(AR_FLAGS) $(AR_OUT_F)$@ $^
$(RANLIB)
-$(BINDIR)/agent$(EXTEXE): $(BINDIR)/main/main$(EXTOBJ) $(LIBTCF)
- $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/main/main$(EXTOBJ) \
+$(BINDIR)/agent$(EXTEXE): $(BINDIR)/tcf/main/main$(EXTOBJ) $(LIBTCF)
+ $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/tcf/main/main$(EXTOBJ) \
$(LIBTCF) $(LIBS)
-$(BINDIR)/client$(EXTEXE): $(BINDIR)/main/main_client$(EXTOBJ) $(LIBTCF)
+$(BINDIR)/client$(EXTEXE): $(BINDIR)/tcf/main/main_client$(EXTOBJ) $(LIBTCF)
$(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ \
- $(BINDIR)/main/main_client$(EXTOBJ) $(LIBTCF) $(LIBS)
+ $(BINDIR)/tcf/main/main_client$(EXTOBJ) $(LIBTCF) $(LIBS)
ifdef LUADIR
-$(BINDIR)/tcflua$(EXTEXE): $(BINDIR)/main/main_lua$(EXTOBJ) $(LIBTCF)
+$(BINDIR)/tcflua$(EXTEXE): $(BINDIR)/tcf/main/main_lua$(EXTOBJ) $(LIBTCF)
$(LINK) $(LINK_FLAGS) $(EXPORT_DYNAMIC) $(LINK_OUT_F)$@ \
- $(BINDIR)/main/main_lua$(EXTOBJ) $(LIBTCF) $(LUALIBS)
+ $(BINDIR)/tcf/main/main_lua$(EXTOBJ) $(LIBTCF) $(LUALIBS)
endif
-$(BINDIR)/tcfreg$(EXTEXE): $(BINDIR)/main/main_reg$(EXTOBJ) $(LIBTCF)
- $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/main/main_reg$(EXTOBJ) \
+$(BINDIR)/tcfreg$(EXTEXE): $(BINDIR)/tcf/main/main_reg$(EXTOBJ) $(LIBTCF)
+ $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/tcf/main/main_reg$(EXTOBJ) \
$(LIBTCF) $(LIBS)
-$(BINDIR)/valueadd$(EXTEXE): $(BINDIR)/main/main_va$(EXTOBJ) $(LIBTCF)
- $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/main/main_va$(EXTOBJ) \
+$(BINDIR)/valueadd$(EXTEXE): $(BINDIR)/tcf/main/main_va$(EXTOBJ) $(LIBTCF)
+ $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/tcf/main/main_va$(EXTOBJ) \
$(LIBTCF) $(LIBS)
-$(BINDIR)/tcflog$(EXTEXE): $(BINDIR)/main/main_log$(EXTOBJ) $(LIBTCF)
- $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/main/main_log$(EXTOBJ) \
+$(BINDIR)/tcflog$(EXTEXE): $(BINDIR)/tcf/main/main_log$(EXTOBJ) $(LIBTCF)
+ $(LINK) $(LINK_FLAGS) $(LINK_OUT_F)$@ $(BINDIR)/tcf/main/main_log$(EXTOBJ) \
$(LIBTCF) $(LIBS)
$(BINDIR)/%$(EXTOBJ): %.c $(CCDEPS)
@@ -98,13 +98,12 @@ install: all
install -d -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/services
install -c $(BINDIR)/agent -m 755 $(INSTALLROOT)$(SBIN)/tcf-agent
install -c $(BINDIR)/client -m 755 $(INSTALLROOT)$(SBIN)/tcf-client
- install -c main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
+ install -c tcf/main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
install -c config.h -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/config.h
install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/framework -m 644 framework/*.h
install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/services -m 644 services/*.h
-ALLFILES = Makefile* *.html *.sln *.vcproj *.h \
- bin framework machine main services system
+ALLFILES = Makefile* *.html *.sln *.vcproj *.h bin tcf
tcf-agent-$(VERSION).tar.bz2: $(HFILES) $(CFILES) Makefile Makefile.inc \
main/tcf-agent.spec main/tcf-agent.init
diff --git a/agent/Makefile.inc b/agent/Makefile.inc
index f99fc2a2..5d59de4d 100644
--- a/agent/Makefile.inc
+++ b/agent/Makefile.inc
@@ -7,8 +7,8 @@ ifndef MACHINE
MACHINE := $(shell uname -m)
endif
-INCDIRS = . system/$(OPSYS) machine/$(MACHINE)
-SRCDIRS = $(INCDIRS) system framework services main
+INCDIRS = . tcf/system/$(OPSYS) tcf/machine/$(MACHINE)
+SRCDIRS = $(INCDIRS) tcf/system tcf/framework tcf/services tcf/main
BINDIR = obj/$(OPSYS)/$(MACHINE)/$(CONF)
MKDIR = mkdir -p $(1)
@@ -118,7 +118,7 @@ endif
ifeq ($(OPSYS),MinGW)
VERSION := 0.4.0
else
- VERSION := $(shell grep "%define version " $(TCF_AGENT_DIR)/main/tcf-agent.spec | sed -e "s/%define version //")
+ VERSION := $(shell grep "%define version " $(TCF_AGENT_DIR)/tcf/main/tcf-agent.spec | sed -e "s/%define version //")
endif
INSTALLROOT ?= /tmp
@@ -132,18 +132,18 @@ OFILES = $(addprefix $(BINDIR)/,$(addsuffix $(EXTOBJ),$(basename $(filter-out ma
EXECS = $(addprefix $(BINDIR)/,agent$(EXTEXE) client$(EXTEXE) tcfreg$(EXTEXE) valueadd$(EXTEXE) tcflog$(EXTEXE))
ifeq ($(OPSYS),Cygwin)
- CFILES += system/Windows/pthreads-win32.c
- CFILES += system/Windows/context-win32.c
+ CFILES += tcf/system/Windows/pthreads-win32.c
+ CFILES += tcf/system/Windows/context-win32.c
endif
ifeq ($(OPSYS),Msys)
- CFILES += system/Windows/pthreads-win32.c
- CFILES += system/Windows/context-win32.c
+ CFILES += tcf/system/Windows/pthreads-win32.c
+ CFILES += tcf/system/Windows/context-win32.c
endif
ifeq ($(OPSYS),MinGW)
- CFILES += system/Windows/pthreads-win32.c
- CFILES += system/Windows/context-win32.c
+ CFILES += tcf/system/Windows/pthreads-win32.c
+ CFILES += tcf/system/Windows/context-win32.c
endif
ifdef SERVICES
diff --git a/agent/tcf/machine/i386/cpudefs-mdep.h b/agent/tcf/machine/i386/cpudefs-mdep.h
index ebebb103..b51cedb5 100644
--- a/agent/tcf/machine/i386/cpudefs-mdep.h
+++ b/agent/tcf/machine/i386/cpudefs-mdep.h
@@ -1 +1 @@
-#include "machine/x86_64/cpudefs-mdep.h"
+#include "tcf/machine/x86_64/cpudefs-mdep.h"
diff --git a/agent/tcf/machine/i686/cpudefs-mdep.h b/agent/tcf/machine/i686/cpudefs-mdep.h
index ebebb103..b51cedb5 100644
--- a/agent/tcf/machine/i686/cpudefs-mdep.h
+++ b/agent/tcf/machine/i686/cpudefs-mdep.h
@@ -1 +1 @@
-#include "machine/x86_64/cpudefs-mdep.h"
+#include "tcf/machine/x86_64/cpudefs-mdep.h"
diff --git a/server/Makefile b/server/Makefile
index 8045a6ef..65e7fe0a 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,4 +1,4 @@
-TCF_AGENT_DIR=..
+TCF_AGENT_DIR=../agent
include $(TCF_AGENT_DIR)/Makefile.inc
@@ -15,8 +15,8 @@ $(BINDIR)/libtcf$(EXTLIB) : $(OFILES)
$(AR) -rc $@ $^
$(RANLIB)
-$(BINDIR)/server$(EXTEXE): $(BINDIR)/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB)
- $(CC) $(CFLAGS) -o $@ $(BINDIR)/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB) $(LIBS)
+$(BINDIR)/server$(EXTEXE): $(BINDIR)/tcf/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB)
+ $(CC) $(CFLAGS) -o $@ $(BINDIR)/tcf/main/main$(EXTOBJ) $(BINDIR)/libtcf$(EXTLIB) $(LIBS)
$(BINDIR)/%$(EXTOBJ): %.c $(HFILES) Makefile
@$(call MKDIR,$(dir $@))

Back to the top