summaryrefslogtreecommitdiff
path: root/manager/bin
diff options
context:
space:
mode:
authorManuel Traut <manut@mecka.net>2012-06-07 13:52:08 +0200
committerManuel Traut <manut@mecka.net>2012-06-07 13:52:08 +0200
commit986a4e78ce5461dc0ada66169bb9111fb0346c46 (patch)
treeff2c7cf1740688313547190fa7626e4543483538 /manager/bin
parente84faa1a220ebdcf79a3d95e539dfc8d86a8c460 (diff)
cleanup project structure
move some subprojects fixup makefiles Signed-off-by: Manuel Traut <manut@mecka.net>
Diffstat (limited to 'manager/bin')
-rw-r--r--manager/bin/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/manager/bin/Makefile b/manager/bin/Makefile
index 994c384..cbfda96 100644
--- a/manager/bin/Makefile
+++ b/manager/bin/Makefile
@@ -2,8 +2,9 @@ CC := $(CROSS_COMPILE)gcc
CXX := $(CROSS_COMPILE)g++
LD := $(CROSS_COMPILE)g++
-DISTRIO_COMMON := ../../common
-DISTRIO_IO := ../../io
+DISTRIO_BASE := ../../
+DISTRIO_COMMON := $(DISTRIO_BASE)common
+DISTRIO_IO := $(DISTRIO_BASE)io/lib
LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common -L$(DISTRIO_IO) -ldistrio_io \
-lrt -lACE -lTAO -lTAO_AnyTypeCode -lTAO_CosNaming -lTAO_PortableServer
@@ -24,7 +25,7 @@ all: $(OBJ)
$(LD) $(LDFLAGS) -o $(EXEC) $(OBJ)
idl:
- $(TAO_IDL) -GI -I../../interfaces ../../interfaces/$(COMPONENT).idl
+ $(TAO_IDL) -GI -I$(DISTRIO_BASE)interfaces $(DISTRIO_BASE)interfaces/$(COMPONENT).idl
rm -f $(COMPONENT)I.cpp $(COMPONENT)I.h
idl_clean: