diff options
Diffstat (limited to 'manager')
| -rw-r--r-- | manager/Makefile | 47 | ||||
| -rw-r--r-- | manager/bin/Makefile | 41 | ||||
| -rw-r--r-- | manager/bin/distrio_manager.cpp (renamed from manager/distrio_manager.cpp) | 0 | ||||
| -rw-r--r-- | manager/bin/distrio_manager.h (renamed from manager/distrio_manager.h) | 0 | ||||
| -rw-r--r-- | manager/bin/manager_base.h (renamed from manager/manager_base.h) | 0 | ||||
| -rwxr-xr-x | manager/bin/run.sh (renamed from manager/run.sh) | 0 | ||||
| -rw-r--r-- | manager/lib/Makefile | 43 |
7 files changed, 93 insertions, 38 deletions
diff --git a/manager/Makefile b/manager/Makefile index 496f3ad..3f45ac7 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -1,41 +1,12 @@ -CC := $(CROSS_COMPILE)gcc -CXX := $(CROSS_COMPILE)g++ -LD := $(CROSS_COMPILE)g++ +MAKE_DIRECTORIES = bin lib -DISTRIO_COMMON := ../common -DISTRIO_IO := ../io +.PHONY: all +idl: $(MAKE_DIRECTORIES) +all: $(MAKE_DIRECTORIES) -LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common -L$(DISTRIO_IO) -ldistrio_io \ - -lACE -lTAO -lTAO_AnyTypeCode -lTAO_CosNaming -lTAO_PortableServer -CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) -CXXFLAGS += $(CFLAGS) +.PHONY: $(MAKE_DIRECTORIES) +$(MAKE_DIRECTORIES): + @$(MAKE) --keep-going --directory=$@ $(MAKECMDGOALS) -TAO_IDL := tao_idl - -DESTDIR := /usr - -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: $(OBJ) - $(LD) $(LDFLAGS) -o $(EXEC) $(OBJ) - -idl: - $(TAO_IDL) -GI -I../interfaces ../interfaces/$(COMPONENT).idl - rm -f $(COMPONENT)I.cpp $(COMPONENT)I.h - -idl_clean: - rm -f $(IDL_CLEANFILES) - -clean: idl_clean - rm -f *.o - rm -f $(EXEC) - -install: all - cp -a $(EXEC) $(DESTDIR)/bin - -uninstall: - rm -f $(DESTDIR)/bin/$(EXEC) +.PHONY: $(MAKECMDGOALS) +$(MAKECMDGOALS): $(MAKE_DIRECTORIES) diff --git a/manager/bin/Makefile b/manager/bin/Makefile new file mode 100644 index 0000000..05c14d7 --- /dev/null +++ b/manager/bin/Makefile @@ -0,0 +1,41 @@ +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_CosNaming -lTAO_PortableServer +CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) +CXXFLAGS += $(CFLAGS) + +TAO_IDL := tao_idl + +DESTDIR := /usr + +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: $(OBJ) + $(LD) $(LDFLAGS) -o $(EXEC) $(OBJ) + +idl: + $(TAO_IDL) -GI -I../../interfaces ../../interfaces/$(COMPONENT).idl + rm -f $(COMPONENT)I.cpp $(COMPONENT)I.h + +idl_clean: + rm -f $(IDL_CLEANFILES) + +clean: idl_clean + rm -f *.o + rm -f $(EXEC) + +install: all + cp -a $(EXEC) $(DESTDIR)/bin + +uninstall: + rm -f $(DESTDIR)/bin/$(EXEC) diff --git a/manager/distrio_manager.cpp b/manager/bin/distrio_manager.cpp index b7671fb..b7671fb 100644 --- a/manager/distrio_manager.cpp +++ b/manager/bin/distrio_manager.cpp diff --git a/manager/distrio_manager.h b/manager/bin/distrio_manager.h index a2820e6..a2820e6 100644 --- a/manager/distrio_manager.h +++ b/manager/bin/distrio_manager.h diff --git a/manager/manager_base.h b/manager/bin/manager_base.h index 790609e..790609e 100644 --- a/manager/manager_base.h +++ b/manager/bin/manager_base.h diff --git a/manager/run.sh b/manager/bin/run.sh index 8162204..8162204 100755 --- a/manager/run.sh +++ b/manager/bin/run.sh diff --git a/manager/lib/Makefile b/manager/lib/Makefile new file mode 100644 index 0000000..fa5d771 --- /dev/null +++ b/manager/lib/Makefile @@ -0,0 +1,43 @@ +CC := $(CROSS_COMPILE)gcc +CXX := $(CROSS_COMPILE)g++ +LD := $(CROSS_COMPILE)g++ + +DISTRIO_COMMON := ../../common +DISTRIO_IO := ../../io + +CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) +CXXFLAGS += $(CFLAGS) + +TAO_IDL := tao_idl + +DESTDIR := /usr + +COMPONENT = distrio_manager +LIB = lib$(COMPONENT).so +OBJ = $(COMPONENT)C.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) |
