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 --- common/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/Makefile b/common/Makefile index e22ebed..c869a74 100644 --- a/common/Makefile +++ b/common/Makefile @@ -2,8 +2,10 @@ CC := $(CROSS_COMPILE)gcc CXX := $(CROSS_COMPILE)g++ LD := $(CROSS_COMPILE)g++ -DISTRIO_IO = ../io -DISTRIO_MANAGER = ../manager/lib +DISTRIO_BASE = ../ + +DISTRIO_IO = $(DISTRIO_BASE)io/lib +DISTRIO_MANAGER = $(DISTRIO_BASE)manager/lib CFLAGS += -fPIC -I. -I$(DISTRIO_IO) -I$(DISTRIO_MANAGER) CXXFLAGS += $(CFLAGS) @@ -24,7 +26,8 @@ all: $(OBJ) .PHONY: idl 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 .PHONY: idl_clean -- cgit v1.2.3