summaryrefslogtreecommitdiff
path: root/manager
diff options
context:
space:
mode:
Diffstat (limited to 'manager')
-rw-r--r--manager/Makefile26
-rw-r--r--manager/distrio_manager.cpp (renamed from manager/manager.cpp)6
2 files changed, 23 insertions, 9 deletions
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;
+}