iMRG: Merge branch 'feature/make4.4'

zoglauer · Nov 21, 2023 · 27f07bd · 27f07bd
2 parents 068c8e0 + cd3bf15
commit 27f07bd
Show file tree

Hide file tree

Showing 21 changed files with 367 additions and 367 deletions.
diff --git a/Makefile b/Makefile
@@ -13,17 +13,17 @@
 
 MAKE += -s
 
-SHELL=/bin/bash
+SHELL	:=/bin/bash
 
 # Basic directories
-TOP	= $(shell pwd)
-SR	= $(TOP)/src
-IN	= $(TOP)/include
-LB	= $(TOP)/lib
-BN	= $(TOP)/bin
-HT	= $(TOP)/doc/html
-CT	= $(TOP)/cint
-CF	= $(TOP)/config
+TOP	:= $(shell pwd)
+SR	:= $(TOP)/src
+IN	:= $(TOP)/include
+LB	:= $(TOP)/lib
+BN	:= $(TOP)/bin
+HT	:= $(TOP)/doc/html
+CT	:= $(TOP)/cint
+CF	:= $(TOP)/config
 
 #------------------------------------------------------------------------------
 # Included options (result of ./configure)
@@ -54,7 +54,7 @@ LDFLAGS     += -L$(LB)
 #------------------------------------------------------------------------------
 # Commands:
 
-CMD=
+CMD :=
 
 #.NOPARALLEL:
 .EXPORT_ALL_VARIABLES: all copy miw geo geolib
@@ -71,8 +71,8 @@ only: info glo geo spe rev siv res mim evi rea fre add cos
 #------------------------------------------------------------------------------
 # Version check:
 
-ROOTVERSIONOK   = $(shell bash $(CF)/configure_rootversiontest )
-GEANT4VERSIONOK = $(shell bash $(CF)/configure_geant4versiontest )
+ROOTVERSIONOK   := $(shell bash $(CF)/configure_rootversiontest )
+GEANT4VERSIONOK := $(shell bash $(CF)/configure_geant4versiontest )
 
 
 #------------------------------------------------------------------------------

diff --git a/config/Makefile.linuxclang b/config/Makefile.linuxclang
@@ -9,23 +9,23 @@
 #----------------------------------------------------------------
 
 
-CMODE         = "Linux with clang compiler"
-DLL           = so
+CMODE         := "Linux with clang compiler"
+DLL           := so
 
 # Basic flags generated by ROOT
-ROOTCFLAGS    = $(shell root-config --cflags)
-ROOTLIBS      = $(shell root-config --libs)
-ROOTGLIBS     = $(shell root-config --glibs)
+ROOTCFLAGS    := $(shell root-config --cflags)
+ROOTLIBS      := $(shell root-config --libs)
+ROOTGLIBS     := $(shell root-config --glibs)
 
 # Compiler & linker options:
-CXX           = clang++
-CXXFLAGS      = $(OPT) -std=c++0x -Wall -Wno-deprecated -fPIC -Wno-overloaded-virtual -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
-DEFINES       = -UHARDWARE
-LD            = clang++
-LDFLAGS       = $(OPT) -D___LINUX___
-SOFLAGS       = -shared  
-LIBS          = $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
-GLIBS         = $(ROOTGLIBS) 
-DEPFLAGS      = -MD -MF
+CXX           := clang++
+CXXFLAGS      := $(OPT) -std=c++0x -Wall -Wno-deprecated -fPIC -Wno-overloaded-virtual -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
+DEFINES       := -UHARDWARE
+LD            := clang++
+LDFLAGS       := $(OPT) -D___LINUX___
+SOFLAGS       := -shared  
+LIBS          := $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
+GLIBS         := $(ROOTGLIBS) 
+DEPFLAGS      := -MD -MF
 
-LINK          = ln -s -f
+LINK          := ln -s -f
diff --git a/config/Makefile.linuxgcc b/config/Makefile.linuxgcc
@@ -9,30 +9,30 @@
 #----------------------------------------------------------------
 
 
-CMODE         = "Linux with gcc utilizing C++14"
-DLL           = so
+CMODE         := "Linux with gcc utilizing C++14"
+DLL           := so
 
 # Basic flags generated by ROOT
-ROOTCFLAGS    = $(shell root-config --cflags)
-ROOTLIBS      = $(shell root-config --libs)
-ROOTGLIBS     = $(shell root-config --glibs)
+ROOTCFLAGS    := $(shell root-config --cflags)
+ROOTLIBS      := $(shell root-config --libs)
+ROOTGLIBS     := $(shell root-config --glibs)
 
 # Compiler & linker options:
-CXX           = g++
-CXXFLAGS      = $(OPT) -std=c++14 -Wall -Wno-deprecated -fPIC -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
-DEFINES       = -UHARDWARE
-LD            = g++
-LDFLAGS       = $(OPT) -D___LINUX___
-SOFLAGS       = -shared  
-LIBS          = $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
-GLIBS         = $(ROOTGLIBS) 
-DEPFLAGS      = -MM
+CXX           := g++
+CXXFLAGS      := $(OPT) -std=c++14 -Wall -Wno-deprecated -fPIC -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
+DEFINES       := -UHARDWARE
+LD            := g++
+LDFLAGS       := $(OPT) -D___LINUX___
+SOFLAGS       := -shared  
+LIBS          := $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
+GLIBS         := $(ROOTGLIBS) 
+DEPFLAGS      := -MM
 
-LINK          = ln -s -f
+LINK          := ln -s -f
 
 # HEASoft
-HEACFLAGS     = 
-HEALIBS       =
+HEACFLAGS     := 
+HEALIBS       :=
 ifneq ("$(wildcard $(LHEASOFT)/include/fitsio.h)", "")
 	HEACFLAGS += -I$(LHEASOFT)/include
 	HEALIBS += -L$(LHEASOFT)/lib 

diff --git a/config/Makefile.linuxicc b/config/Makefile.linuxicc
@@ -9,23 +9,23 @@
 #----------------------------------------------------------------
 
 
-CMODE         = "Linux with icc compiler"
-DLL           = so
+CMODE         := "Linux with icc compiler"
+DLL           := so
 
 # Basic flags generated by ROOT
-ROOTCFLAGS    = $(shell root-config --cflags)
-ROOTLIBS      = $(shell root-config --libs)
-ROOTGLIBS     = $(shell root-config --glibs)
+ROOTCFLAGS    := $(shell root-config --cflags)
+ROOTLIBS      := $(shell root-config --libs)
+ROOTGLIBS     := $(shell root-config --glibs)
 
 # Compiler & linker options:
-CXX           = icc
-CXXFLAGS      = $(OPT) -fPIC -wd1572 -wd1125 -wd654 -wd191 -wd1224 -wd1476 -wd913 -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
-DEFINES       = -UHARDWARE
-LD            = icc
-LDFLAGS       = $(OPT) -D___LINUX___
-SOFLAGS       = -shared  
-LIBS          = $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
-GLIBS         = $(ROOTGLIBS) 
-DEPFLAGS      = -M
+CXX           := icc
+CXXFLAGS      := $(OPT) -fPIC -wd1572 -wd1125 -wd654 -wd191 -wd1224 -wd1476 -wd913 -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___LINUX___ -D___CLING___
+DEFINES       := -UHARDWARE
+LD            := icc
+LDFLAGS       := $(OPT) -D___LINUX___
+SOFLAGS       := -shared  
+LIBS          := $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
+GLIBS         := $(ROOTGLIBS) 
+DEPFLAGS      := -M
 
-LINK          = ln -s -f
+LINK          := ln -s -f
diff --git a/config/Makefile.macosx b/config/Makefile.macosx
@@ -9,31 +9,31 @@
 #----------------------------------------------------------------
 
 
-CMODE         = "MacOSX with clang compiler"
-ARCH          = macosx
-DLL           = so
+CMODE         := "MacOSX with clang compiler"
+ARCH          := macosx
+DLL           := so
 
 # Basic flags generated by ROOT
-ROOTCFLAGS    = $(shell root-config --cflags)
-ROOTLIBS      = $(shell root-config --libs)
-ROOTGLIBS     = $(shell root-config --glibs)
+ROOTCFLAGS    := $(shell root-config --cflags)
+ROOTLIBS      := $(shell root-config --libs)
+ROOTGLIBS     := $(shell root-config --glibs)
 
 # Compiler & linker options:
-CXX           = c++
-CXXFLAGS      = $(OPT) -std=c++14 -pipe -Wall -fPIC -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___MACOSX___ -D___CLING___ -Wno-unused-but-set-variable -Wno-overloaded-virtual -Wno-tautological-undefined-compare -Wno-deprecated-declarations
-DEFINES       = -UHARDWARE
-LD            = c++
-LDFLAGS       = $(OPT) -Xlinker -bind_at_load -flat_namespace -D___MACOSX___
-SOFLAGS       = -dynamiclib -flat_namespace -undefined suppress 
-LIBS          = $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
-GLIBS         = $(ROOTGLIBS) 
-DEPFLAGS      = -M
-
-LINK          = ln -s -f
+CXX           := c++
+CXXFLAGS      := $(OPT) -std=c++14 -pipe -Wall -fPIC -D_REENTRANT -I$(IN) -I$(CT) -I. $(ROOTCFLAGS) -D___MACOSX___ -D___CLING___ -Wno-unused-but-set-variable -Wno-overloaded-virtual -Wno-tautological-undefined-compare -Wno-deprecated-declarations
+DEFINES       := -UHARDWARE
+LD            := c++
+LDFLAGS       := $(OPT) -Xlinker -bind_at_load -flat_namespace -D___MACOSX___
+SOFLAGS       := -dynamiclib -flat_namespace -undefined suppress 
+LIBS          := $(ROOTLIBS) -lpthread -lThread -lMinuit -lGeom -lSpectrum -lTMVA
+GLIBS         := $(ROOTGLIBS) 
+DEPFLAGS      := -M
+
+LINK          := ln -s -f
 
 # HEASoft
-HEACFLAGS     =
-HEALIBS       =
+HEACFLAGS     :=
+HEALIBS       :=
 ifneq ("$(wildcard $(LHEASOFT)/include/fitsio.h)", "")
         HEACFLAGS += -I$(LHEASOFT)/include
         HEALIBS += -L$(LHEASOFT)/lib

diff --git a/configure b/configure
@@ -515,9 +515,9 @@ echo "# Section A: Additional libraries" >> config/Makefile.options
 echo "# " >> config/Makefile.options
 echo "# Important: Don't modify this sections by yourself " >> config/Makefile.options
 echo " " >> config/Makefile.options
-echo "GEANT4INSTALLED  = ${Geant4Found}" >> config/Makefile.options
-echo "HEASOFTINSTALLED = ${FitsIOFound}" >> config/Makefile.options
-echo "MPIINSTALLED = ${MPIFound}" >> config/Makefile.options
+echo "GEANT4INSTALLED  := ${Geant4Found}" >> config/Makefile.options
+echo "HEASOFTINSTALLED := ${FitsIOFound}" >> config/Makefile.options
+echo "MPIINSTALLED     := ${MPIFound}" >> config/Makefile.options
 echo " " >> config/Makefile.options
 
 echo "# " >> config/Makefile.options
@@ -538,7 +538,7 @@ if [[ ${ARCH} == linux ]]; then
 fi
 echo "Please see the file config/Makefile.options for more optimization options for the Intel and GNU compiler"
 echo "" >> config/Makefile.options
-echo "OPT = ${OPTIONS}" >> config/Makefile.options
+echo "OPT := ${OPTIONS}" >> config/Makefile.options
 if ( [ $Geant4Found -eq 0 ] ); then 
     echo "$G4DEBUG" >> config/Makefile.options
 fi
@@ -551,10 +551,10 @@ echo "#            If you have anything else, set it in Makefile.user " >> confi
 echo "# " >> config/Makefile.options
 echo "" >> config/Makefile.options
 if ( [ $Geant4OpenGLFound -eq 0 ] ); then 
-    echo "G4VIS_USE_OPENGLX=1" >> config/Makefile.options
+    echo "G4VIS_USE_OPENGLX  := 1" >> config/Makefile.options
 fi
 if ( [ $Geant4DawnFileFound -eq 0 ] ); then 
-    echo "G4VIS_USE_DAWNFILE=1" >> config/Makefile.options
+    echo "G4VIS_USE_DAWNFILE := 1" >> config/Makefile.options
 fi
 echo "" >> config/Makefile.options
 

diff --git a/src/addon/Makefile b/src/addon/Makefile
@@ -15,7 +15,7 @@
 # Definitions:
 #
 
-PRGSX = \
+PRGSX := \
 	$(BN)/SensitivityOptimizer \
 	$(BN)/Mask \
 	$(BN)/ConvertMGeant \
@@ -37,18 +37,18 @@ PRGSX = \
 	$(BN)/IsotopeFileSplitter \
 	$(BN)/VariableSourceDetector \
 
-FITS = \
+FITS := \
 	$(BN)/TraFitsConverter \
 	$(BN)/ConvertMGGPOD \
 	$(BN)/ResponseToXSPEC \
 
-MPI = $(BN)/bundler
+MPI := $(BN)/bundler
 
 
 
-MLIBS = -L$(LB) -lMimrecGui -lMimrec -lRevanGui -lRevan -lSivanGui -lSivan -lSpectralyzeGui -lSpectralyze -lGeomegaGui -lGeomega -lCommonMisc -lCommonGui  
+MLIBS := -L$(LB) -lMimrecGui -lMimrec -lRevanGui -lRevan -lSivanGui -lSivan -lSpectralyzeGui -lSpectralyze -lGeomegaGui -lGeomega -lCommonMisc -lCommonGui  
 
-EVERYTHING = $(PRGSX) $(FITS)
+EVERYTHING := $(PRGSX) $(FITS)
 
 #----------------------------------------------------------------
 # Commands:

diff --git a/src/eview/Makefile b/src/eview/Makefile
@@ -12,17 +12,17 @@
 # Base definitions:
 #
 
-PROGRAM = eview
+PROGRAM := eview
 
-MAIN  = MEviewMain
+MAIN    := MEviewMain
 
-LIBRARY = Eview
+LIBRARY := Eview
 
-FILES = MGUIEviewMain \
+FILES := MGUIEviewMain \
 	MSettingsEview \
 	MGUIEviewOptions \
 
-LIBRARIES = \
+LIBRARIES := \
 	-lRevan \
 	-lRevanGui \
 	-lSivan \
@@ -36,20 +36,20 @@ LIBRARIES = \
 # Derived definitions:
 #
 
-OBJECTS=$(patsubst %, $(LB)/%.o, $(FILES))
-HEADERS=$(patsubst %, inc/%.h, $(FILES))
-SHAREDLIB=$(LB)/lib$(LIBRARY).$(DLL)
+OBJECTS:=$(patsubst %, $(LB)/%.o, $(FILES))
+HEADERS:=$(patsubst %, inc/%.h, $(FILES))
+SHAREDLIB:=$(LB)/lib$(LIBRARY).$(DLL)
 
-DICTIONARYNAME=$(LIBRARY)_Dictionary
-DICTIONARY=$(LB)/$(DICTIONARYNAME).cxx
-DICTIONARYOBJECT=$(LB)/$(DICTIONARYNAME).o
-LINKDEF=$(LB)/$(DICTIONARYNAME)_LinkDef.h
-ROOTMAP=$(LB)/lib$(LIBRARY).rootmap
-ROOTPCM=lib$(LIBRARY)_rdict.pcm
+DICTIONARYNAME:=$(LIBRARY)_Dictionary
+DICTIONARY:=$(LB)/$(DICTIONARYNAME).cxx
+DICTIONARYOBJECT:=$(LB)/$(DICTIONARYNAME).o
+LINKDEF:=$(LB)/$(DICTIONARYNAME)_LinkDef.h
+ROOTMAP:=$(LB)/lib$(LIBRARY).rootmap
+ROOTPCM:=lib$(LIBRARY)_rdict.pcm
 
 
-OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN))
-EXECUTABLE=$(BN)/$(PROGRAM)
+OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN))
+EXECUTABLE:=$(BN)/$(PROGRAM)
 
 
 #----------------------------------------------------------------

diff --git a/src/fretalon/base/Makefile b/src/fretalon/base/Makefile
@@ -12,9 +12,9 @@
 # Base definitions:
 #
 
-LIBRARY = FretalonBase
+LIBRARY := FretalonBase
 
-FILES = MFretalonRegistry \
+FILES := MFretalonRegistry \
 	MFileReadOuts \
 	MReadOut \
 	MReadOutElement \
@@ -43,9 +43,9 @@ FILES = MFretalonRegistry \
 	MCalibrationFitGaussLandau \
 	MCalibrationModel \
 
-SLOBJ = libFretalonBase.$(DLL)
+SLOBJ := libFretalonBase.$(DLL)
 
-LIBRARIES = \
+LIBRARIES := \
 	-lSivan \
 	-lGeomega \
 	-lCommonGui \
@@ -55,16 +55,16 @@ LIBRARIES = \
 # Derived definitions:
 #
 
-OBJECTS=$(patsubst %, $(LB)/%.o, $(FILES))
-HEADERS=$(patsubst %, inc/%.h, $(FILES))
-SHAREDLIB=$(LB)/lib$(LIBRARY).$(DLL)
+OBJECTS:=$(patsubst %, $(LB)/%.o, $(FILES))
+HEADERS:=$(patsubst %, inc/%.h, $(FILES))
+SHAREDLIB:=$(LB)/lib$(LIBRARY).$(DLL)
 
-DICTIONARYNAME=$(LIBRARY)_Dictionary
-DICTIONARY=$(LB)/$(DICTIONARYNAME).cxx
-DICTIONARYOBJECT=$(LB)/$(DICTIONARYNAME).o
-LINKDEF=$(LB)/$(DICTIONARYNAME)_LinkDef.h
-ROOTMAP=$(LB)/lib$(LIBRARY).rootmap
-ROOTPCM=lib$(LIBRARY)_rdict.pcm
+DICTIONARYNAME:=$(LIBRARY)_Dictionary
+DICTIONARY:=$(LB)/$(DICTIONARYNAME).cxx
+DICTIONARYOBJECT:=$(LB)/$(DICTIONARYNAME).o
+LINKDEF:=$(LB)/$(DICTIONARYNAME)_LinkDef.h
+ROOTMAP:=$(LB)/lib$(LIBRARY).rootmap
+ROOTPCM:=lib$(LIBRARY)_rdict.pcm
 
 
 #----------------------------------------------------------------