diff options
| author | Manuel Traut <manut@mecka.net> | 2012-06-07 13:52:08 +0200 |
|---|---|---|
| committer | Manuel Traut <manut@mecka.net> | 2012-06-07 13:52:08 +0200 |
| commit | 986a4e78ce5461dc0ada66169bb9111fb0346c46 (patch) | |
| tree | ff2c7cf1740688313547190fa7626e4543483538 /manager | |
| parent | e84faa1a220ebdcf79a3d95e539dfc8d86a8c460 (diff) | |
cleanup project structure
move some subprojects
fixup makefiles
Signed-off-by: Manuel Traut <manut@mecka.net>
Diffstat (limited to 'manager')
| -rw-r--r-- | manager/Makefile | 12 | ||||
| -rw-r--r-- | manager/bin/Makefile | 7 | ||||
| -rw-r--r-- | manager/lib/Makefile | 9 |
3 files changed, 10 insertions, 18 deletions
diff --git a/manager/Makefile b/manager/Makefile deleted file mode 100644 index 3f45ac7..0000000 --- a/manager/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -MAKE_DIRECTORIES = bin lib - -.PHONY: all -idl: $(MAKE_DIRECTORIES) -all: $(MAKE_DIRECTORIES) - -.PHONY: $(MAKE_DIRECTORIES) -$(MAKE_DIRECTORIES): - @$(MAKE) --keep-going --directory=$@ $(MAKECMDGOALS) - -.PHONY: $(MAKECMDGOALS) -$(MAKECMDGOALS): $(MAKE_DIRECTORIES) 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: diff --git a/manager/lib/Makefile b/manager/lib/Makefile index fa5d771..b24cc0d 100644 --- a/manager/lib/Makefile +++ b/manager/lib/Makefile @@ -2,8 +2,10 @@ 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 CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) 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 |