Merge pull request #102 from Negusbuk/master

cleanup in makefiles and ROOT5/6 usage
DESY-FH-ELab · Sep 5, 2016 · a832373 · a832373
2 parents c338811 + 807fc4f
commit a832373
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 8 deletions.
diff --git a/configure b/configure
@@ -19,6 +19,7 @@ CONFIGDEFINES=""
 ROOTCFLAGS=`root-config --cflags`
 ROOTLIBS=`root-config --libs`
 ROOTGLIBS=`root-config --glibs`
+ROOTMAJOR=`root-config --version | cut -d . -f 1`
 
 while test $# -gt 0; do 
   case $1 in
@@ -118,7 +119,7 @@ else
     echo build with ASSEMBLY support
 fi
 
-SED_VARIABLES="BASEPATH ARCHITECTURE KERNELMAJOR KERNELMINOR QMAKE CXX CC LD NODEFO NOTHERMAL NOASSEMBLY APPLICATIONVERSIONSTR USEFAKEDEVICES WITHTWITTERSUPPORT SOFLAGS CONFIGDEFINES QWTDEFINES QWTINCLUDES QWTLIBS ROOTCFLAGS ROOTLIBS ROOTGLIBS"
+SED_VARIABLES="BASEPATH ARCHITECTURE KERNELMAJOR KERNELMINOR QMAKE CXX CC LD NODEFO NOTHERMAL NOASSEMBLY APPLICATIONVERSIONSTR USEFAKEDEVICES WITHTWITTERSUPPORT SOFLAGS CONFIGDEFINES QWTDEFINES QWTINCLUDES QWTLIBS ROOTCFLAGS ROOTLIBS ROOTGLIBS ROOTMAJOR"
 
 echo "#!/bin/sh
 dest=\`basename \$1 .in\`

diff --git a/thermo/microDAQ/microDAQ.pro.in b/thermo/microDAQ/microDAQ.pro.in
@@ -7,7 +7,7 @@ LIBS += -L@basepath@/devices/lib -lTkModLabHuber
 LIBS += -L@basepath@/devices/lib -lTkModLabArduino
 LIBS += -L@basepath@/devices/lib -lTkModLabCori
 LIBS += -L@basepath@/common -lCommon
-LIBS += -lcurl -L@basepath@/external/twitcurl -ltwitcurl
+LIBS += -L@basepath@/external/twitcurl -ltwitcurl -lcurl
 LIBS += @qwtlibs@
 
 QMAKE = @qmake@

diff --git a/thermo/thermoDAQ/thermoDAQ.pro.in b/thermo/thermoDAQ/thermoDAQ.pro.in
@@ -5,7 +5,7 @@ LIBS += -L@basepath@/devices/lib -lTkModLabHameg
 LIBS += -L@basepath@/devices/lib -lTkModLabPfeiffer
 LIBS += -L@basepath@/devices/lib -lTkModLabHuber
 LIBS += -L@basepath@/common -lCommon
-LIBS += -lcurl -L@basepath@/external/twitcurl -ltwitcurl 
+LIBS += -L@basepath@/external/twitcurl -ltwitcurl -lcurl
 LIBS += @qwtlibs@
 
 QMAKE = @qmake@

diff --git a/tkmodlabenv.csh.in b/tkmodlabenv.csh.in
@@ -22,3 +22,5 @@ setenv DYLD_LIBRARY_PATH "@basepath@/tools/TkModLabRoot:$DYLD_LIBRARY_PATH"
 setenv DYLD_LIBRARY_PATH "@basepath@/common:$DYLD_LIBRARY_PATH"
 setenv DYLD_LIBRARY_PATH "@basepath@/defo/defoCommon:$DYLD_LIBRARY_PATH"
 setenv DYLD_LIBRARY_PATH "@basepath@/assembly/assemblyCommon:$DYLD_LIBRARY_PATH"
+
+setenv PKG_CONFIG_PATH "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
diff --git a/tkmodlabenv.sh.in b/tkmodlabenv.sh.in
@@ -23,3 +23,5 @@ export DYLD_LIBRARY_PATH="@basepath@/tools/TkModLabRoot:$DYLD_LIBRARY_PATH"
 export DYLD_LIBRARY_PATH="@basepath@/common:$DYLD_LIBRARY_PATH"
 export DYLD_LIBRARY_PATH="@basepath@/defo/defoCommon:$DYLD_LIBRARY_PATH"
 export DYLD_LIBRARY_PATH="@basepath@/assembly/assemblyCommon:$DYLD_LIBRARY_PATH"
+
+export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
diff --git a/tools/TkModLabRoot/.gitignore b/tools/TkModLabRoot/.gitignore
@@ -1,5 +1,6 @@
 *.o
-TkModLabRootDict*
+*Dict.*
 *.d
+*.pcm
 libTkModLabRoot.*
 
diff --git a/tools/TkModLabRoot/Makefile.in b/tools/TkModLabRoot/Makefile.in
@@ -22,6 +22,15 @@ ARCHITECTURE := $(shell uname)
 ROOTCFLAGS   := $(shell root-config --cflags)
 ROOTLIBS     := $(shell root-config --libs)
 ROOTGLIBS    := $(shell root-config --glibs)
+ROOTMAJOR    := $(shell root-config --version | cut -d . -f 1)
+
+ifeq ($(ROOTMAJOR),5)
+OBJECTS      := $(addsuffix .o,$(MODULES)) $(TARGET)5Dict.o
+endif
+
+ifeq ($(ROOTMAJOR),6)
+OBJECTS      := $(addsuffix .o,$(MODULES)) $(TARGET)6Dict.o
+endif
 
 # c-compiler
 CC            = gcc
@@ -46,23 +55,38 @@ endif
 
 CXXFLAGS     += $(ROOTCFLAGS)
 
+RLIBMAP	 := rlibmap
 RLIBDEP	 := libSmatrix.so libGraf.so
-RML	     := $(addprefix -rml ,$(RLIBDEP))
+RML	     := $(addprefix -rml ,$(RLIBDEP)) $(addprefix -rml ,lib$(TARGET).so)
 
 ELIBS    := $(BASEPATH)/external/ddierckx/*.o
 
 ALLDEPEND = $(addsuffix .d,$(MODULES))
 EXISTDEPEND = $(shell find . -name \*.d -type f -print)
 
+ifeq ($(ROOTMAJOR),5)
+all:  depend lib$(TARGET).so lib$(TARGET).rootmap
+endif
+
+ifeq ($(ROOTMAJOR),6)
 all:  depend lib$(TARGET).so
+endif
 
-lib$(TARGET).so: $(addsuffix .o,$(MODULES)) $(TARGET)Dict.o
+lib$(TARGET).so: $(OBJECTS)
 	@echo "Linking shared library $@"
 	@$(LD) $(SOFLAGS) $^ -o $@ $(ELIBS) -lgfortran
 
-$(TARGET)Dict.cc: $(addsuffix .h,$(MODULES)) LinkDef.h
+lib$(TARGET).rootmap: lib$(TARGET).so LinkDef.h
+	@echo "Creating library rootmap $@"
+	@$(RLIBMAP) -f -o $@ -d lib$(TARGET).so $(RLIBDEP) -c LinkDef.h
+
+$(TARGET)5Dict.cc: $(addsuffix .h,$(MODULES)) LinkDef.h
+	@echo "Generating dictionary $@"
+	@rootcint -f $(TARGET)5Dict.cc -c $(CPPFLAGS) -p $(addsuffix .h,$(MODULES)) LinkDef.h
+
+$(TARGET)6Dict.cc: $(addsuffix .h,$(MODULES)) LinkDef.h
 	@echo "Generating dictionary $@"
-	rootcling -f $(TARGET)Dict.cc -rmf lib$(TARGET).rootmap $(RML) $(addsuffix .h,$(MODULES)) LinkDef.h
+	@rootcling -f $(TARGET)6Dict.cc -rmf lib$(TARGET).rootmap $(RML) $(addsuffix .h,$(MODULES)) LinkDef.h
 
 %.d: %.cc
 	@echo Making dependency for file $< ...
@@ -80,6 +104,7 @@ depend: $(ALLDEPEND)
 clean:
 	@rm -f $(addsuffix .o,$(MODULES))
 	@rm -f *Dict.*
+	@rm -f *Dict_rdict.pcm
 	@rm -f lib$(TARGET).so
 	@rm -f lib$(TARGET).rootmap
 	@rm -f *.d