From 986a4e78ce5461dc0ada66169bb9111fb0346c46 Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Thu, 7 Jun 2012 13:52:08 +0200 Subject: cleanup project structure move some subprojects fixup makefiles Signed-off-by: Manuel Traut --- Makefile | 2 +- common/Makefile | 9 +- devices/simple_dev/Makefile | 8 +- generic_gpio/Makefile | 36 ------ generic_gpio/generic_gpio.cpp | 45 ------- generic_gpio/run.sh | 9 -- io/Makefile | 42 ------- io/bin/Makefile | 12 ++ io/bin/generic_gpio/Makefile | 39 +++++++ io/bin/generic_gpio/generic_gpio.cpp | 45 +++++++ io/bin/generic_gpio/run.sh | 9 ++ io/distrio_io.cpp | 220 ----------------------------------- io/lib/Makefile | 45 +++++++ io/lib/distrio_io.cpp | 220 +++++++++++++++++++++++++++++++++++ manager/Makefile | 12 -- manager/bin/Makefile | 7 +- manager/lib/Makefile | 9 +- 17 files changed, 392 insertions(+), 377 deletions(-) delete mode 100644 generic_gpio/Makefile delete mode 100644 generic_gpio/generic_gpio.cpp delete mode 100755 generic_gpio/run.sh delete mode 100644 io/Makefile create mode 100644 io/bin/Makefile create mode 100644 io/bin/generic_gpio/Makefile create mode 100644 io/bin/generic_gpio/generic_gpio.cpp create mode 100755 io/bin/generic_gpio/run.sh delete mode 100644 io/distrio_io.cpp create mode 100644 io/lib/Makefile create mode 100644 io/lib/distrio_io.cpp delete mode 100644 manager/Makefile 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/generic_gpio/Makefile b/generic_gpio/Makefile deleted file mode 100644 index 954034d..0000000 --- a/generic_gpio/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -CC := $(CROSS_COMPILE)gcc -CXX := $(CROSS_COMPILE)g++ -LD := $(CROSS_COMPILE)g++ - -DISTRIO_COMMON := ../common -DISTRIO_MANAGER := ../manager/lib -DISTRIO_IO := ../io - -LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common \ - -L$(DISTRIO_IO) -ldistrio_io \ - -L$(DISTRIO_MANAGER) -ldistrio_manager \ - -lACE -lTAO -lTAO_AnyTypeCode -lTAO_CosNaming -lTAO_PortableServer -CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) -I$(DISTRIO_MANAGER) -CXXFLAGS += $(CFLAGS) - -DESTDIR := /usr - -COMPONENT = distrio_generic_gpio -EXEC = $(COMPONENT) -OBJ = generic_gpio.o - -all: $(OBJ) - $(LD) $(LDFLAGS) -o $(EXEC) $(OBJ) - -clean: - rm -f *.o - rm -f $(EXEC) - -install: all - cp -a $(EXEC) $(DESTDIR)/bin - -uninstall: - rm -f $(DESTDIR)/bin/$(EXEC) - -idl: - /bin/true diff --git a/generic_gpio/generic_gpio.cpp b/generic_gpio/generic_gpio.cpp deleted file mode 100644 index 325cb9c..0000000 --- a/generic_gpio/generic_gpio.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include - -#include - -#include - -class My_digital : public Distrio_Digital_i { - public: - ::CORBA::Long id (void) - { - return my_id; - } - void id (::CORBA::Long id) - { - my_id = id; - } - private: - ::CORBA::Long my_id; -}; - -int main (int argc, char **argv) -{ - int ret = 0; - My_digital *digital; - - if (init_corba (argc, argv)) - return -EINVAL; - - if (run_orb ()) - return -EINVAL; - - digital = new My_digital (); - - if (register_digital ("pin huhu", digital)) { - ret = -EINVAL; - goto out; - } - - std::cout << "registered id: " << digital->id () << std::endl; - -out: - free (digital); - return ret; -} diff --git a/generic_gpio/run.sh b/generic_gpio/run.sh deleted file mode 100755 index ab1068f..0000000 --- a/generic_gpio/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# -# startup script for distrio generic gpio exporter -# -# author: Manuel Traut - -LD_LIBRARY_PATH=../io:../common:../manager/lib ./distrio_generic_gpio \ - -ORBInitRef NameService=corbaloc:iiop:localhost:12345/NameService \ - $@ diff --git a/io/Makefile b/io/Makefile deleted file mode 100644 index e609b7f..0000000 --- a/io/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -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/bin/Makefile b/io/bin/Makefile new file mode 100644 index 0000000..0b74f55 --- /dev/null +++ b/io/bin/Makefile @@ -0,0 +1,12 @@ +MAKE_DIRECTORIES = generic_gpio + +.PHONY: all +idl: $(MAKE_DIRECTORIES) +all: $(MAKE_DIRECTORIES) + +.PHONY: $(MAKE_DIRECTORIES) +$(MAKE_DIRECTORIES): + @$(MAKE) --keep-going --directory=$@ $(MAKECMDGOALS) + +.PHONY: $(MAKECMDGOALS) +$(MAKECMDGOALS): $(MAKE_DIRECTORIES) diff --git a/io/bin/generic_gpio/Makefile b/io/bin/generic_gpio/Makefile new file mode 100644 index 0000000..c8aa810 --- /dev/null +++ b/io/bin/generic_gpio/Makefile @@ -0,0 +1,39 @@ +CC := $(CROSS_COMPILE)gcc +CXX := $(CROSS_COMPILE)g++ +LD := $(CROSS_COMPILE)g++ + + +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 \ + -L$(DISTRIO_MANAGER) -ldistrio_manager \ + -lACE -lTAO -lTAO_AnyTypeCode -lTAO_CosNaming -lTAO_PortableServer +CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) -I$(DISTRIO_MANAGER) +CXXFLAGS += $(CFLAGS) + +DESTDIR := /usr + +COMPONENT = distrio_generic_gpio +EXEC = $(COMPONENT) +OBJ = generic_gpio.o + +all: $(OBJ) + $(LD) $(LDFLAGS) -o $(EXEC) $(OBJ) + +clean: + rm -f *.o + rm -f $(EXEC) + +install: all + cp -a $(EXEC) $(DESTDIR)/bin + +uninstall: + rm -f $(DESTDIR)/bin/$(EXEC) + +idl: + /bin/true diff --git a/io/bin/generic_gpio/generic_gpio.cpp b/io/bin/generic_gpio/generic_gpio.cpp new file mode 100644 index 0000000..325cb9c --- /dev/null +++ b/io/bin/generic_gpio/generic_gpio.cpp @@ -0,0 +1,45 @@ +#include +#include + +#include + +#include + +class My_digital : public Distrio_Digital_i { + public: + ::CORBA::Long id (void) + { + return my_id; + } + void id (::CORBA::Long id) + { + my_id = id; + } + private: + ::CORBA::Long my_id; +}; + +int main (int argc, char **argv) +{ + int ret = 0; + My_digital *digital; + + if (init_corba (argc, argv)) + return -EINVAL; + + if (run_orb ()) + return -EINVAL; + + digital = new My_digital (); + + if (register_digital ("pin huhu", digital)) { + ret = -EINVAL; + goto out; + } + + std::cout << "registered id: " << digital->id () << std::endl; + +out: + free (digital); + return ret; +} diff --git a/io/bin/generic_gpio/run.sh b/io/bin/generic_gpio/run.sh new file mode 100755 index 0000000..ab1068f --- /dev/null +++ b/io/bin/generic_gpio/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# startup script for distrio generic gpio exporter +# +# author: Manuel Traut + +LD_LIBRARY_PATH=../io:../common:../manager/lib ./distrio_generic_gpio \ + -ORBInitRef NameService=corbaloc:iiop:localhost:12345/NameService \ + $@ diff --git a/io/distrio_io.cpp b/io/distrio_io.cpp deleted file mode 100644 index deae171..0000000 --- a/io/distrio_io.cpp +++ /dev/null @@ -1,220 +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 "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 -} - -::Distrio::Timestamp Distrio_Digital_i::last_update ( - void) -{ - // Add your implementation here -} - -void Distrio_Digital_i::last_update ( - const ::Distrio::Timestamp & last_update) -{ - // 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 -} - -::Distrio::Timestamp Distrio_Analog_i::last_update ( - void) -{ - // Add your implementation here -} - -void Distrio_Analog_i::last_update ( - const ::Distrio::Timestamp & last_update) -{ - // 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/io/lib/Makefile b/io/lib/Makefile new file mode 100644 index 0000000..4b79e01 --- /dev/null +++ b/io/lib/Makefile @@ -0,0 +1,45 @@ +CC := $(CROSS_COMPILE)gcc +CXX := $(CROSS_COMPILE)g++ +LD := $(CROSS_COMPILE)g++ + +DISTRIO_BASE = ../../ + +DISTRIO_COMMON := $(DISTRIO_BASE)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$(DISTRIO_BASE)interfaces \ + $(DISTRIO_BASE)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/lib/distrio_io.cpp b/io/lib/distrio_io.cpp new file mode 100644 index 0000000..deae171 --- /dev/null +++ b/io/lib/distrio_io.cpp @@ -0,0 +1,220 @@ +// -*- 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 +} + +::Distrio::Timestamp Distrio_Digital_i::last_update ( + void) +{ + // Add your implementation here +} + +void Distrio_Digital_i::last_update ( + const ::Distrio::Timestamp & last_update) +{ + // 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 +} + +::Distrio::Timestamp Distrio_Analog_i::last_update ( + void) +{ + // Add your implementation here +} + +void Distrio_Analog_i::last_update ( + const ::Distrio::Timestamp & last_update) +{ + // 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 deleted file mode 100644 index 3f45ac7..0000000 --- a/manager/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -MAKE_DIRECTORIES = bin lib - -.PHONY: all -idl: $(MAKE_DIRECTORIES) -all: $(MAKE_DIRECTORIES) - -.PHONY: $(MAKE_DIRECTORIES) -$(MAKE_DIRECTORIES): - @$(MAKE) --keep-going --directory=$@ $(MAKECMDGOALS) - -.PHONY: $(MAKECMDGOALS) -$(MAKECMDGOALS): $(MAKE_DIRECTORIES) 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 -- cgit v1.2.3