From 89e787c826890aed88f632b1fd5cf4f65541067f Mon Sep 17 00:00:00 2001
From: Manuel Traut <manut@mecka.net>
Date: Sat, 2 Jun 2012 18:40:19 +0200
Subject: fix includes paths, etc

common, io, manager can be build now

Signed-off-by: Manuel Traut <manut@mecka.net>
---
 common/Makefile           | 22 +++++++++++++++-------
 common/common.cpp         | 32 --------------------------------
 common/distrio_common.cpp | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 39 deletions(-)
 delete mode 100644 common/common.cpp
 create mode 100644 common/distrio_common.cpp

(limited to 'common')

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/common.cpp
deleted file mode 100644
index cea3ed2..0000000
--- a/common/common.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- 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 "commonI.h"
-
diff --git a/common/distrio_common.cpp b/common/distrio_common.cpp
new file mode 100644
index 0000000..56631ce
--- /dev/null
+++ b/common/distrio_common.cpp
@@ -0,0 +1,32 @@
+// -*- 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_commonI.h"
+
-- 
cgit v1.2.3