From 89e787c826890aed88f632b1fd5cf4f65541067f Mon Sep 17 00:00:00 2001 From: Manuel Traut 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 --- manager/Makefile | 26 +++++++---- manager/distrio_manager.cpp | 106 ++++++++++++++++++++++++++++++++++++++++++++ manager/manager.cpp | 102 ------------------------------------------ 3 files changed, 124 insertions(+), 110 deletions(-) create mode 100644 manager/distrio_manager.cpp delete mode 100644 manager/manager.cpp (limited to 'manager') 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/distrio_manager.cpp b/manager/distrio_manager.cpp new file mode 100644 index 0000000..8cd2f03 --- /dev/null +++ b/manager/distrio_manager.cpp @@ -0,0 +1,106 @@ +// -*- 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_managerI.h" + +// Implementation skeleton constructor +Distrio_Manager_i::Distrio_Manager_i (void) +{ +} + +// Implementation skeleton destructor +Distrio_Manager_i::~Distrio_Manager_i (void) +{ +} + +::Distrio::Error * Distrio_Manager_i::digital ( + ::Distrio::Digital_list_out io_list) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::analog ( + ::Distrio::Analog_list_out io_list) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::device ( + ::Distrio::Device_list_out dev_list) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::register_io_digital ( + ::Distrio::Analog_ptr io_ana) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::register_io_analog ( + ::Distrio::Digital_ptr io_dig) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::register_io_device ( + ::Distrio::Device_ptr io_dev) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::unregister_io_digital ( + ::Distrio::Digital_ptr io_dig) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::unregister_io_analog ( + ::Distrio::Analog_ptr io_ana) +{ + // Add your implementation here +} + +::Distrio::Error * Distrio_Manager_i::unregister_io_device ( + ::Distrio::Device_ptr io_dev) +{ + // Add your implementation here +} + +void Distrio_Manager_i::log_error ( + const ::Distrio::Error & error) +{ + // Add your implementation here +} + +int main (int argc, char **argv) +{ + return 0; +} diff --git a/manager/manager.cpp b/manager/manager.cpp deleted file mode 100644 index c6964e3..0000000 --- a/manager/manager.cpp +++ /dev/null @@ -1,102 +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 "managerI.h" - -// Implementation skeleton constructor -Distrio_Manager_i::Distrio_Manager_i (void) -{ -} - -// Implementation skeleton destructor -Distrio_Manager_i::~Distrio_Manager_i (void) -{ -} - -::Distrio::Error * Distrio_Manager_i::digital ( - ::Distrio::Digital_list_out io_list) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::analog ( - ::Distrio::Analog_list_out io_list) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::device ( - ::Distrio::Device_list_out dev_list) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::register_io_digital ( - ::Distrio::Analog_ptr io_ana) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::register_io_analog ( - ::Distrio::Digital_ptr io_dig) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::register_io_device ( - ::Distrio::Device_ptr io_dev) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::unregister_io_digital ( - ::Distrio::Digital_ptr io_dig) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::unregister_io_analog ( - ::Distrio::Analog_ptr io_ana) -{ - // Add your implementation here -} - -::Distrio::Error * Distrio_Manager_i::unregister_io_device ( - ::Distrio::Device_ptr io_dev) -{ - // Add your implementation here -} - -void Distrio_Manager_i::log_error ( - const ::Distrio::Error & error) -{ - // Add your implementation here -} - -- cgit v1.2.3