From 32244b2958cb08827dd140991f09ee7cef497f7a Mon Sep 17 00:00:00 2001
From: gscalamera <graziano.scalamera@elettra.eu>
Date: Wed, 8 Feb 2017 10:32:57 +0100
Subject: [PATCH] added makefiles submodule
---
.gitmodules | 3 ++
.makefiles | 1 +
Make-8.1.2.c.in | 66 ------------------------------------
Make-9.2.2.in | 89 -------------------------------------------------
Makefile | 3 +-
5 files changed, 5 insertions(+), 157 deletions(-)
create mode 100644 .gitmodules
create mode 160000 .makefiles
delete mode 100644 Make-8.1.2.c.in
delete mode 100644 Make-9.2.2.in
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e43aba2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".makefiles"]
+ path = .makefiles
+ url = https://github.com/ELETTRA-SincrotroneTrieste/makefiles.git
diff --git a/.makefiles b/.makefiles
new file mode 160000
index 0000000..3c45cfb
--- /dev/null
+++ b/.makefiles
@@ -0,0 +1 @@
+Subproject commit 3c45cfb725c2c01479525a015a6a9bd671980bf4
diff --git a/Make-8.1.2.c.in b/Make-8.1.2.c.in
deleted file mode 100644
index cc8413e..0000000
--- a/Make-8.1.2.c.in
+++ /dev/null
@@ -1,66 +0,0 @@
-CXXFLAGS += -std=gnu++98
-
-TANGO_DIR ?= /usr/local/tango-8.1.2.c
-OMNIORB_DIR ?= /usr/local/omniorb-4.1.6
-RUNTIME_DIR ?= /runtime
-
-TANGO_INC = ${TANGO_DIR}/include/tango
-OMNIORB_INC = ${OMNIORB_DIR}/include
-RUNTIME_INC = ${RUNTIME_DIR}/include
-
-INC_DIR = -I${TANGO_INC} -I${OMNIORB_INC} -I${RUNTIME_INC}
-
-TANGO_LIB = ${TANGO_DIR}/lib
-OMNIORB_LIB = ${OMNIORB_DIR}/lib
-RUNTIME_LIB = ${RUNTIME_DIR}/lib
-
-LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${RUNTIME_LIB} -L/usr/local/lib
-
-#-----------------------------------------
-# Default make entry
-#-----------------------------------------
-default: release
-release debug: bin/$(NAME_SRV)
-
-#-----------------------------------------
-# Set CXXFLAGS and LDFLAGS
-#----------------------------------------r
-CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -pedantic -Wall -Wextra \
- -Wno-non-virtual-dtor -Wno-long-long -DOMNI_UNLOADABLE_STUBS \
- $(INC_DIR) -Isrc
-LDFLAGS += $(LIB_DIR) -ltango -llog4tango -lomniORB4 -lomniDynamic4 \
- -lCOS4 -lomnithread -lzmq
-
-#-----------------------------------------
-# Set dependencies
-#-----------------------------------------
-SRC_FILES += $(wildcard src/*.cpp)
-OBJ_FILES += $(addprefix obj/,$(notdir $(SRC_FILES:.cpp=.o)))
-
-obj/%.o: $(SRC_FILES:%.cpp)
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-.nse_depinfo: $(SRC_FILES)
- @$(CXX) $(CXXFLAGS) -M -MM $^ | sed 's/\(.*\)\.o/obj\/\1.o/g' > $@
--include .nse_depinfo
-
-#-----------------------------------------
-# Main make entries
-#-----------------------------------------
-bin/$(NAME_SRV): bin obj $(OBJ_FILES)
- $(CXX) $(CXXFLAGS) $(OBJ_FILES) -o bin/$(NAME_SRV) $(LDFLAGS)
-
-clean:
- @rm -fr obj/ bin/ core* .nse_depinfo src/*~
-
-bin obj:
- @mkdir $@
-
-#-----------------------------------------
-# Target specific options
-#-----------------------------------------
-release: CXXFLAGS += -O2 -DNDEBUG
-release: LDFLAGS += -s
-debug: CXXFLAGS += -ggdb3
-
-.PHONY: clean
diff --git a/Make-9.2.2.in b/Make-9.2.2.in
deleted file mode 100644
index c261ce4..0000000
--- a/Make-9.2.2.in
+++ /dev/null
@@ -1,89 +0,0 @@
-CXXFLAGS += -std=c++0x
-
-GCCMAJOR := $(shell ${CXX} -dumpversion | cut -d"." -f1)
-GCCMINOR := $(shell ${CXX} -dumpversion | cut -d"." -f2)
-ifeq ($(GCCMAJOR),4)
- ifneq ($(GCCMINOR),8)
- SYSROOT := $(shell ${CXX} -print-sysroot)
- endif
-endif
-MACHINE := $(shell ${CXX} -dumpmachine)
-
-TANGO_DIR := /usr/local/tango-9.2.2
-OMNIORB_DIR := /usr/local/omniorb-4.2.1
-ZMQ_DIR := /usr/local/zeromq-4.0.7
-RUNTIME_DIR := /runtime
-
-TANGO_INC := ${TANGO_DIR}/include/tango
-OMNIORB_INC := ${OMNIORB_DIR}/include
-RUNTIME_INC := ${RUNTIME_DIR}/include
-ZMQ_INC := ${ZMQ_DIR}/include
-
-ifeq ($(SYSROOT),)
- INC_DIR = -I${TANGO_INC} -I${OMNIORB_INC} -I${ZMQ_INC} -I${RUNTIME_INC}
-else
- INC_DIR = -I${SYSROOT}/usr/include/tango -I/srv/${MACHINE}/runtime/
-endif
-
-TANGO_LIB = ${TANGO_DIR}/lib
-OMNIORB_LIB = ${OMNIORB_DIR}/lib
-RUNTIME_LIB = ${RUNTIME_DIR}/lib
-ZMQ_LIB = ${ZMQ_DIR}/lib
-
-ifeq ($(SYSROOT),)
-LIB_DIR = -L${TANGO_LIB} -L${OMNIORB_LIB} -L${RUNTIME_LIB} -L${ZMQ_LIB}
-else
- LIB_DIR = -L/srv/${MACHINE}/runtime/lib
-endif
-
-#-----------------------------------------
-# Default make entry
-#-----------------------------------------
-default: release
-release debug: bin/$(NAME_SRV)
-
-#-----------------------------------------
-# Set CXXFLAGS and LDFLAGS
-#----------------------------------------r
-CXXFLAGS += -D__linux__ -D__OSVERSION__=2 -pedantic -Wall \
- -Wno-non-virtual-dtor -Wno-long-long -DOMNI_UNLOADABLE_STUBS \
- $(INC_DIR) -Isrc
-ifeq ($(GCCMAJOR),4)
- CXXFLAGS += -Wextra
-endif
-LDFLAGS += $(LIB_DIR) -ltango -llog4tango -lomniORB4 -lomniDynamic4 \
- -lCOS4 -lomnithread -lzmq
-
-#-----------------------------------------
-# Set dependencies
-#-----------------------------------------
-SRC_FILES += $(wildcard src/*.cpp)
-OBJ_FILES += $(addprefix obj/,$(notdir $(SRC_FILES:.cpp=.o)))
-
-obj/%.o: $(SRC_FILES:%.cpp)
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-.nse_depinfo: $(SRC_FILES)
- @$(CXX) $(CXXFLAGS) -M -MM $^ | sed 's/\(.*\)\.o/obj\/\1.o/g' > $@
--include .nse_depinfo
-
-#-----------------------------------------
-# Main make entries
-#-----------------------------------------
-bin/$(NAME_SRV): bin obj $(OBJ_FILES)
- $(CXX) $(CXXFLAGS) $(OBJ_FILES) -o bin/$(NAME_SRV) $(LDFLAGS)
-
-clean:
- @rm -fr obj/ bin/ core* .nse_depinfo src/*~
-
-bin obj:
- @mkdir $@
-
-#-----------------------------------------
-# Target specific options
-#-----------------------------------------
-release: CXXFLAGS += -O2 -DNDEBUG
-release: LDFLAGS += -s
-debug: CXXFLAGS += -ggdb3
-
-.PHONY: clean
diff --git a/Makefile b/Makefile
index 6f580c3..d2f79b9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,5 +7,4 @@ CXXFLAGS += `mysql_config --include`
LDFLAGS += `mysql_config --libs_r` -lboost_thread
-#include ./Make-8.1.2.c.in
-include ./Make-9.2.2.in
+include ./.makefiles/Make-9.2.2.in
--
GitLab