fix includes paths, etc

common, io, manager can be build now

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

10 files changed, 289 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 56a94fb..9b89793 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-MAKE_DIRECTORIES = common manager
+MAKE_DIRECTORIES = common io manager
 
 .PHONY: all
+idl: $(MAKE_DIRECTORIES)
 all: $(MAKE_DIRECTORIES)
 
 .PHONY: $(MAKE_DIRECTORIES)
diff --git a/common/Makefile b/common/Makefile
index d4f0594..441b13f 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -2,27 +2,35 @@ CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
 LD := $(CROSS_COMPILE)g++
 
+CFLAGS += -fPIC
+CXXFLAGS += $(CFLAGS)
+
 TAO_IDL := tao_idl
 
 DESTDIR := /usr
 
-LIB = libdistrio_common.so
-OBJ = commonC.o common.o commonS.o
+COMPONENT = distrio_common
+LIB = lib$(COMPONENT).so
+OBJ = $(COMPONENT)C.o $(COMPONENT).o $(COMPONENT)S.o
 
-IDL_CLEANFILES = commonC.cpp commonC.inl commonI.h commonS.h commonC.h \
-	commonS.cpp
+IDL_CLEANFILES = $(COMPONENT)C.cpp $(COMPONENT)C.inl $(COMPONENT)I.h \
+	$(COMPONENT)S.h $(COMPONENT)C.h $(COMPONENT)S.cpp
 
-all: idl $(OBJ)
+all: $(OBJ)
 	$(LD) -shared -o $(LIB) $(OBJ)
 
+.PHONY: idl
 idl:
-	$(TAO_IDL) -GI -I../interfaces ../interfaces/common.idl
-	rm -f commonI.cpp
+	$(TAO_IDL) -GI -I../interfaces ../interfaces/$(COMPONENT).idl
+	rm -f $(COMPONENT)I.cpp
 
+.PHONY: idl_clean
 idl_clean:
 	rm -f $(IDL_CLEANFILES)
 
+.PHONY: clean
 clean: idl_clean
+	rm -f *.o
 	rm -f $(LIB)
 
 install: all
diff --git a/common/common.cpp b/common/distrio_common.cpp
index cea3ed2..56631ce 100644
--- a/common/common.cpp
+++ b/common/distrio_common.cpp
@@ -28,5 +28,5 @@
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:1673
 
-#include "commonI.h"
+#include "distrio_commonI.h"
 
diff --git a/interfaces/common.idl b/interfaces/distrio_common.idl
index ded0d1e..8756732 100644
--- a/interfaces/common.idl
+++ b/interfaces/distrio_common.idl
@@ -17,19 +17,19 @@ module Distrio {
  */
 	enum Error_code {
 		SUCCESS,
-		EINVAL,
-		ENOTSUPPORTED
+		E_INVAL,
+		E_NOTSUPPORTED
 	};
 
 /**
  * @brief used for filtering and classification
  */
 	enum Error_level {
-		DEBUG,
-		INFO,
-		WARNING,
-		NORMAL,
-		CRITICAL
+		L_DEBUG,
+		L_INFO,
+		L_WARNING,
+		L_NORMAL,
+		L_CRITICAL
 	};
 
 /**
diff --git a/interfaces/io.idl b/interfaces/distrio_io.idl
index 27f9ae8..25d69a8 100644
--- a/interfaces/io.idl
+++ b/interfaces/distrio_io.idl
@@ -1,7 +1,7 @@
 #ifndef DISTRIO_IO_IDL
 #define DISTRIO_IO_IDL
 
-#include "common.idl"
+#include "distrio_common.idl"
 
 /**
  * @brief the implementation of these interfaces are responsible for
diff --git a/interfaces/manager.idl b/interfaces/distrio_manager.idl
index f1dffa1..83ab13e 100644
--- a/interfaces/manager.idl
+++ b/interfaces/distrio_manager.idl
@@ -1,8 +1,8 @@
 #ifndef DISTRDistrio_CONTROLLER_IDL
 #define DISTRDistrio_CONTROLLER_IDL
 
-#include "common.idl"
-#include "io.idl"
+#include "distrio_common.idl"
+#include "distrio_io.idl"
 
 /**
  * @brief logical view of IO's and Devices (not HW specific)
diff --git a/io/Makefile b/io/Makefile
new file mode 100644
index 0000000..e609b7f
--- /dev/null
+++ b/io/Makefile
@@ -0,0 +1,42 @@
+CC := $(CROSS_COMPILE)gcc
+CXX := $(CROSS_COMPILE)g++
+LD := $(CROSS_COMPILE)g++
+
+DISTRIO_COMMON := ../common
+
+CFLAGS += -fPIC -I$(DISTRIO_COMMON)
+CXXFLAGS += $(CFLAGS)
+
+TAO_IDL := tao_idl
+
+DESTDIR := /usr
+
+COMPONENT = distrio_io
+LIB = lib$(COMPONENT).so
+OBJ = $(COMPONENT)C.o $(COMPONENT).o $(COMPONENT)S.o
+
+IDL_CLEANFILES = $(COMPONENT)C.cpp $(COMPONENT)C.inl $(COMPONENT)I.h \
+	$(COMPONENT)S.h $(COMPONENT)C.h $(COMPONENT)S.cpp
+
+all: $(OBJ)
+	$(LD) -shared -o $(LIB) $(OBJ)
+
+.PHONY: idl
+idl:
+	$(TAO_IDL) -GI -I../interfaces ../interfaces/$(COMPONENT).idl
+	rm -f $(COMPONENT)I.cpp
+
+.PHONY: idl_clean
+idl_clean:
+	rm -f $(IDL_CLEANFILES)
+
+.PHONY: clean
+clean: idl_clean
+	rm -f *.o
+	rm -f $(LIB)
+
+install: all
+	cp -a $(LIB) $(DESTDIR)/lib
+
+uninstall:
+	rm -f $(DESTDIR)/lib/$(LIB)
diff --git a/io/distrio_io.cpp b/io/distrio_io.cpp
new file mode 100644
index 0000000..e102dbd
--- /dev/null
+++ b/io/distrio_io.cpp
@@ -0,0 +1,196 @@
+// -*- C++ -*-
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.2
+ * TAO and the TAO IDL Compiler have been developed by:
+ *       Center for Distributed Object Computing
+ *       Washington University
+ *       St. Louis, MO
+ *       USA
+ *       http://www.cs.wustl.edu/~schmidt/doc-center.html
+ * and
+ *       Distributed Object Computing Laboratory
+ *       University of California at Irvine
+ *       Irvine, CA
+ *       USA
+ * and
+ *       Institute for Software Integrated Systems
+ *       Vanderbilt University
+ *       Nashville, TN
+ *       USA
+ *       http://www.isis.vanderbilt.edu/
+ *
+ * Information about TAO is available at:
+ *     http://www.cs.wustl.edu/~schmidt/TAO.html
+ **/
+
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:1673
+
+#include "distrio_ioI.h"
+
+// Implementation skeleton constructor
+Distrio_Digital_i::Distrio_Digital_i (void)
+{
+}
+
+// Implementation skeleton destructor
+Distrio_Digital_i::~Distrio_Digital_i (void)
+{
+}
+
+::Distrio::Error * Distrio_Digital_i::name (
+  ::CORBA::String_out name)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Digital_i::set (
+  void)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Digital_i::reset (
+  void)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Digital_i::get (
+  ::CORBA::Long_out value)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Digital_i::register_callback (
+  ::Distrio::Device_ptr dev,
+  ::Distrio::Digital_trigger trigger)
+{
+  // Add your implementation here
+}
+
+::CORBA::Long Distrio_Digital_i::id (
+  void)
+{
+  // Add your implementation here
+}
+
+void Distrio_Digital_i::id (
+  ::CORBA::Long id)
+{
+  // Add your implementation here
+}
+
+// Implementation skeleton constructor
+Distrio_Analog_i::Distrio_Analog_i (void)
+{
+}
+
+// Implementation skeleton destructor
+Distrio_Analog_i::~Distrio_Analog_i (void)
+{
+}
+
+::Distrio::Error * Distrio_Analog_i::name (
+  ::CORBA::String_out name)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Analog_i::min (
+  ::CORBA::Long_out min)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Analog_i::max (
+  ::CORBA::Long_out max)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Analog_i::set (
+  ::CORBA::Long value)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Analog_i::get (
+  ::CORBA::Long_out value)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Analog_i::register_callback (
+  ::Distrio::Device_ptr dev,
+  const ::Distrio::Analog_trigger & trigger)
+{
+  // Add your implementation here
+}
+
+::CORBA::Long Distrio_Analog_i::id (
+  void)
+{
+  // Add your implementation here
+}
+
+void Distrio_Analog_i::id (
+  ::CORBA::Long id)
+{
+  // Add your implementation here
+}
+
+// Implementation skeleton constructor
+Distrio_Device_i::Distrio_Device_i (void)
+{
+}
+
+// Implementation skeleton destructor
+Distrio_Device_i::~Distrio_Device_i (void)
+{
+}
+
+::Distrio::Error * Distrio_Device_i::name (
+  ::CORBA::String_out name)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Device_i::execute (
+  const ::Distrio::Dev_function & func)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Device_i::functions (
+  ::Distrio::Dev_function_list_out funcs)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Device_i::callback_digital (
+  ::Distrio::Digital_ptr io_dig)
+{
+  // Add your implementation here
+}
+
+::Distrio::Error * Distrio_Device_i::callback_analog (
+  ::Distrio::Analog_ptr io_ana)
+{
+  // Add your implementation here
+}
+
+::CORBA::Long Distrio_Device_i::id (
+  void)
+{
+  // Add your implementation here
+}
+
+void Distrio_Device_i::id (
+  ::CORBA::Long id)
+{
+  // Add your implementation here
+}
+
diff --git a/manager/Makefile b/manager/Makefile
index da7fd9b..28f7421 100644
--- a/manager/Makefile
+++ b/manager/Makefile
@@ -2,26 +2,36 @@ CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
 LD := $(CROSS_COMPILE)g++
 
+DISTRIO_COMMON := ../common
+DISTRIO_IO := ../io
+
+LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common -L$(DISTRIO_IO) -ldistrio_io \
+	-lACE -lTAO -lTAO_AnyTypeCode -lTAO_PortableServer
+CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO)
+CXXFLAGS += $(CFLAGS)
+
 TAO_IDL := tao_idl
 
 DESTDIR := /usr
 
-EXEC = distrio-manager
-OBJ = managerC.o managerS.o manager.o
-IDL_CLEANFILES = managerC.cpp managerC.h managerI.h managerS.cpp managerS.h \
-	managerC.inl
+COMPONENT = distrio_manager
+EXEC = $(COMPONENT)
+OBJ = $(COMPONENT)C.o $(COMPONENT)S.o $(COMPONENT).o
+IDL_CLEANFILES = $(COMPONENT)C.cpp $(COMPONENT)C.h $(COMPONENT)I.h \
+	$(COMPONENT)S.cpp $(COMPONENT)S.h $(COMPONENT)C.inl
 
-all: idl $(OBJ)
-	$(LD) -o $(EXEC) $(OBJ)
+all: $(OBJ)
+	$(LD) $(LDFLAGS) -o $(EXEC) $(OBJ)
 
 idl:
-	$(TAO_IDL) -GI -I../interfaces ../interfaces/manager.idl
-	rm -f managerI.cpp
+	$(TAO_IDL) -GI -I../interfaces ../interfaces/$(COMPONENT).idl
+	rm -f $(COMPONENT)I.cpp
 
 idl_clean:
 	rm -f $(IDL_CLEANFILES)
 
 clean: idl_clean
+	rm *.o
 	rm -f $(EXEC)
 
 install: all
diff --git a/manager/manager.cpp b/manager/distrio_manager.cpp
index c6964e3..8cd2f03 100644
--- a/manager/manager.cpp
+++ b/manager/distrio_manager.cpp
@@ -28,7 +28,7 @@
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:1673
 
-#include "managerI.h"
+#include "distrio_managerI.h"
 
 // Implementation skeleton constructor
 Distrio_Manager_i::Distrio_Manager_i (void)
@@ -100,3 +100,7 @@ void Distrio_Manager_i::log_error (
   // Add your implementation here
 }
 
+int main (int argc, char **argv)
+{
+	return 0;
+}