cleanup project structure

move some subprojects
fixup makefiles

Signed-off-by: Manuel Traut <manut@mecka.net>

11 files changed, 34 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index f86b6fc..8338471 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MAKE_DIRECTORIES = common io manager generic_gpio devices
+MAKE_DIRECTORIES = io/lib common manager/lib devices io/bin manager/bin
 
 .PHONY: all
 idl: $(MAKE_DIRECTORIES)
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
diff --git a/devices/simple_dev/Makefile b/devices/simple_dev/Makefile
index 0d6e728..9ea290e 100644
--- a/devices/simple_dev/Makefile
+++ b/devices/simple_dev/Makefile
@@ -2,9 +2,11 @@ CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
 LD := $(CROSS_COMPILE)g++
 
-DISTRIO_MANAGER := ../../manager/lib
-DISTRIO_COMMON := ../../common
-DISTRIO_IO := ../../io
+DISTRIO_BASE = ../../
+
+DISTRIO_MANAGER := $(DISTRIO_BASE)manager/lib
+DISTRIO_IO := $(DISTRIO_BASE)io/lib
+DISTRIO_COMMON := $(DISTRIO_BASE)common
 
 LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common \
 	-L$(DISTRIO_IO) -ldistrio_io \
diff --git a/manager/Makefile b/io/bin/Makefile
index 3f45ac7..0b74f55 100644
--- a/manager/Makefile
+++ b/io/bin/Makefile
@@ -1,4 +1,4 @@
-MAKE_DIRECTORIES = bin lib
+MAKE_DIRECTORIES = generic_gpio
 
 .PHONY: all
 idl: $(MAKE_DIRECTORIES)
diff --git a/generic_gpio/Makefile b/io/bin/generic_gpio/Makefile
index 954034d..c8aa810 100644
--- a/generic_gpio/Makefile
+++ b/io/bin/generic_gpio/Makefile
@@ -2,9 +2,12 @@ CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
 LD := $(CROSS_COMPILE)g++
 
-DISTRIO_COMMON := ../common
-DISTRIO_MANAGER := ../manager/lib
-DISTRIO_IO := ../io
+
+DISTRIO_BASE = ../../../
+
+DISTRIO_COMMON := $(DISTRIO_BASE)common
+DISTRIO_MANAGER := $(DISTRIO_BASE)manager/lib
+DISTRIO_IO := $(DISTRIO_BASE)io/lib
 
 LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common \
 	-L$(DISTRIO_IO) -ldistrio_io \
diff --git a/generic_gpio/generic_gpio.cpp b/io/bin/generic_gpio/generic_gpio.cpp
index 325cb9c..325cb9c 100644
--- a/generic_gpio/generic_gpio.cpp
+++ b/io/bin/generic_gpio/generic_gpio.cpp
diff --git a/generic_gpio/run.sh b/io/bin/generic_gpio/run.sh
index ab1068f..ab1068f 100755
--- a/generic_gpio/run.sh
+++ b/io/bin/generic_gpio/run.sh
diff --git a/io/Makefile b/io/lib/Makefile
index e609b7f..4b79e01 100644
--- a/io/Makefile
+++ b/io/lib/Makefile
@@ -2,7 +2,9 @@ CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
 LD := $(CROSS_COMPILE)g++
 
-DISTRIO_COMMON := ../common
+DISTRIO_BASE = ../../
+
+DISTRIO_COMMON := $(DISTRIO_BASE)common
 
 CFLAGS += -fPIC -I$(DISTRIO_COMMON)
 CXXFLAGS += $(CFLAGS)
@@ -23,7 +25,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
diff --git a/io/distrio_io.cpp b/io/lib/distrio_io.cpp
index deae171..deae171 100644
--- a/io/distrio_io.cpp
+++ b/io/lib/distrio_io.cpp
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