From 986a4e78ce5461dc0ada66169bb9111fb0346c46 Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Thu, 7 Jun 2012 13:52:08 +0200 Subject: cleanup project structure move some subprojects fixup makefiles Signed-off-by: Manuel Traut --- manager/bin/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'manager/bin') 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: -- cgit v1.2.3