From cd3bf15f1331679a5dcedb0496aa9602936b8d56 Mon Sep 17 00:00:00 2001 From: Andreas Zoglauer Date: Fri, 17 Nov 2023 11:21:45 -0800 Subject: [PATCH] CHG: Changes for make 4.4 --- Makefile | 24 ++++++------- config/Makefile.linuxclang | 30 ++++++++-------- config/Makefile.linuxgcc | 34 +++++++++--------- config/Makefile.linuxicc | 30 ++++++++-------- config/Makefile.macosx | 38 ++++++++++---------- configure | 12 +++---- src/addon/Makefile | 10 +++--- src/eview/Makefile | 32 ++++++++--------- src/fretalon/base/Makefile | 26 +++++++------- src/fretalon/framework/Makefile | 10 +++--- src/fretalon/melinator/Makefile | 62 ++++++++++++++++----------------- src/geomega/Makefile | 54 ++++++++++++++-------------- src/global/gui/Makefile | 22 ++++++------ src/global/misc/Makefile | 22 ++++++------ src/global/neuralnet/Makefile | 10 +++--- src/mimrec/Makefile | 54 ++++++++++++++-------------- src/realta/Makefile | 62 ++++++++++++++++----------------- src/response/Makefile | 40 ++++++++++----------- src/revan/Makefile | 54 ++++++++++++++-------------- src/sivan/Makefile | 54 ++++++++++++++-------------- src/spectralyze/Makefile | 54 ++++++++++++++-------------- 21 files changed, 367 insertions(+), 367 deletions(-) diff --git a/Makefile b/Makefile index 079b7f7b5..c08215ae4 100644 --- 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 index 569b007a5..c601a599c 100644 --- 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 index db54c9d91..d9f7ca68b 100644 --- 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 index 16e03d1c8..5cd22386d 100644 --- 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 index f76bd6281..7ed957113 100644 --- 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 index 54d481b5b..3bbe40b2f 100755 --- 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 index 38ced029c..61e645080 100644 --- 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 index 23d03bf13..e69c79daa 100644 --- 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 index c28d2a025..908af8a6d 100644 --- 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 #---------------------------------------------------------------- diff --git a/src/fretalon/framework/Makefile b/src/fretalon/framework/Makefile index 90fcbc6f9..4832c40ea 100644 --- a/src/fretalon/framework/Makefile +++ b/src/fretalon/framework/Makefile @@ -24,11 +24,11 @@ LIBRARY := Fretalon SOBJ := $(LB)/lib$(LIBRARY).$(DLL) LIBRARIES := -DICTIONARYNAME=$(LIBRARY)_Dictionary -DICTIONARY=$(LB)/$(DICTIONARYNAME).cxx -DICTIONARYOBJECT=$(LB)/$(DICTIONARYNAME).o -LINKDEF=$(LB)/$(DICTIONARYNAME)_LinkDef.h -ROOTMAP=$(LB)/lib$(LIBRARY).rootmap +DICTIONARYNAME:=$(LIBRARY)_Dictionary +DICTIONARY:=$(LB)/$(DICTIONARYNAME).cxx +DICTIONARYOBJECT:=$(LB)/$(DICTIONARYNAME).o +LINKDEF:=$(LB)/$(DICTIONARYNAME)_LinkDef.h +ROOTMAP:=$(LB)/lib$(LIBRARY).rootmap #---------------------------------------------------------------- # Commands: diff --git a/src/fretalon/melinator/Makefile b/src/fretalon/melinator/Makefile index 8bf012bca..61755b9fe 100644 --- a/src/fretalon/melinator/Makefile +++ b/src/fretalon/melinator/Makefile @@ -12,18 +12,18 @@ # Base definitions: # -PROGRAM = melinator +PROGRAM := melinator -MAIN = MMelinatorMain +MAIN := MMelinatorMain -LIBRARY = Melinator +LIBRARY := Melinator -FILES = MSettingsMelinator \ +FILES := MSettingsMelinator \ MMelinator \ -LIBRARY_UI = MelinatorGui +LIBRARY_UI := MelinatorGui -FILES_UI = \ +FILES_UI := \ MGUIMainMelinator \ MGUIEReadOutElement \ MGUIEReadOutElementView \ @@ -31,7 +31,7 @@ FILES_UI = \ MGUILoadCalibration \ MInterfaceMelinator \ -LIBRARIES = \ +LIBRARIES := \ -lFretalonBase \ -lSivan \ -lGeomega \ @@ -42,30 +42,30 @@ LIBRARIES = \ # Derived definitions: # -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 - -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) - -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm - -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +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 + +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) + +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm + +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #---------------------------------------------------------------- diff --git a/src/geomega/Makefile b/src/geomega/Makefile index d93e036a3..45648dabe 100644 --- a/src/geomega/Makefile +++ b/src/geomega/Makefile @@ -12,13 +12,13 @@ # Base definitions: # -PROGRAM = geomega +PROGRAM := geomega -MAIN = MGeomegaMain +MAIN := MGeomegaMain -LIBRARY = Geomega +LIBRARY := Geomega -FILES = MSettingsGeomega \ +FILES := MSettingsGeomega \ MDGeometry \ MDGeometryQuest \ MDVolume \ @@ -63,15 +63,15 @@ FILES = MSettingsGeomega \ MDOrientation \ MDGDMLImport \ -LIBRARY_UI = GeomegaGui +LIBRARY_UI := GeomegaGui -FILES_UI = \ +FILES_UI := \ MInterfaceGeomega \ MGUIGeomegaMain \ MGUIPosition \ MGUIPathLength -LIBRARIES = \ +LIBRARIES := \ -lCommonGui \ -lCommonMisc \ @@ -80,31 +80,31 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #---------------------------------------------------------------- diff --git a/src/global/gui/Makefile b/src/global/gui/Makefile index b3b72183e..553c50317 100644 --- a/src/global/gui/Makefile +++ b/src/global/gui/Makefile @@ -12,9 +12,9 @@ # Base definitions: # -LIBRARY = CommonGui +LIBRARY := CommonGui -FILES = MGUIDefaults \ +FILES := MGUIDefaults \ MGUIDialog \ MGUIElement \ MGUIEEntry \ @@ -47,16 +47,16 @@ FILES = MGUIDefaults \ # 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 #---------------------------------------------------------------- # Commands: diff --git a/src/global/misc/Makefile b/src/global/misc/Makefile index 5850ac38d..64eb5489b 100644 --- a/src/global/misc/Makefile +++ b/src/global/misc/Makefile @@ -12,9 +12,9 @@ # Base definitions: # -LIBRARY = CommonMisc +LIBRARY := CommonMisc -FILES = MGlobal \ +FILES := MGlobal \ MAssert \ MCoordinateSystem \ MExceptions \ @@ -112,16 +112,16 @@ FILES = MGlobal \ # 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 #---------------------------------------------------------------- diff --git a/src/global/neuralnet/Makefile b/src/global/neuralnet/Makefile index 50b75ffb8..93b714d8d 100755 --- a/src/global/neuralnet/Makefile +++ b/src/global/neuralnet/Makefile @@ -12,11 +12,11 @@ # Definitions: # -PRGT = $(BN)/neuralnettester +PRGT := $(BN)/neuralnettester -TOBJS = $(LB)/Main.o +TOBJS := $(LB)/Main.o -NOBJS = $(LB)/MNeuron.o \ +NOBJS := $(LB)/MNeuron.o \ $(LB)/MAdalineNeuron.o \ $(LB)/MBiasNeuron.o \ $(LB)/MInputNeuron.o \ @@ -33,9 +33,9 @@ NOBJS = $(LB)/MNeuron.o \ $(LB)/MNeuralNetworkBackpropagation.o \ $(LB)/MNeuralNetworkBackpropagationAssembly.o \ -OBJS = $(NOBJS) $(TOBJS) +OBJS := $(NOBJS) $(TOBJS) -SNOBJ = $(LB)/libNeuralNet.$(DLL) +SNOBJ := $(LB)/libNeuralNet.$(DLL) diff --git a/src/mimrec/Makefile b/src/mimrec/Makefile index 3582f18c6..c48e80ced 100644 --- a/src/mimrec/Makefile +++ b/src/mimrec/Makefile @@ -12,13 +12,13 @@ # Base definitions: # -PROGRAM = mimrec +PROGRAM := mimrec -MAIN = MMimrecMain +MAIN := MMimrecMain -LIBRARY = Mimrec +LIBRARY := Mimrec -FILES = MSettingsMimrec \ +FILES := MSettingsMimrec \ MSettingsImaging \ MSettingsEventSelections \ MBPData \ @@ -56,9 +56,9 @@ FILES = MSettingsMimrec \ MStandardAnalysis \ MVariableSourceDetector \ -LIBRARY_UI = MimrecGui +LIBRARY_UI := MimrecGui -FILES_UI = \ +FILES_UI := \ MInterfaceMimrec \ MGUIMimrecMain \ MGUIHistogramData \ @@ -79,7 +79,7 @@ FILES_UI = \ MGUIPolarization \ MGUIExposure \ -LIBRARIES = \ +LIBRARIES := \ -lSpectralyze \ -lSpectralyzeGui \ -lCommonMisc \ @@ -91,31 +91,31 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #---------------------------------------------------------------- diff --git a/src/realta/Makefile b/src/realta/Makefile index 191af4f50..9ec1ab2b0 100644 --- a/src/realta/Makefile +++ b/src/realta/Makefile @@ -12,26 +12,26 @@ # Base definitions: # -PROGRAM1 = realta -MAIN1 = MRealtaMain +PROGRAM1 := realta +MAIN1 := MRealtaMain -PROGRAM2 = eventtransmitter -MAIN2 = MEventTransmitter +PROGRAM2 := eventtransmitter +MAIN2 := MEventTransmitter -LIBRARY = Realta +LIBRARY := Realta -FILES = MSettingsRealta \ +FILES := MSettingsRealta \ MRealTimeAnalyzer \ MRealTimeEvent \ -LIBRARY_UI = RealtaGui +LIBRARY_UI := RealtaGui -FILES_UI = \ +FILES_UI := \ MGUIRealtaMain \ MGUINetwork \ MGUIAccumulation \ -LIBRARIES = \ +LIBRARIES := \ -lGeomega \ -lRevan \ -lRevanGui \ @@ -48,35 +48,35 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN1=$(patsubst %, $(LB)/%.o, $(MAIN1)) -EXECUTABLE1=$(BN)/$(PROGRAM1) +OBJECT_MAIN1:=$(patsubst %, $(LB)/%.o, $(MAIN1)) +EXECUTABLE1:=$(BN)/$(PROGRAM1) -OBJECT_MAIN2=$(patsubst %, $(LB)/%.o, $(MAIN2)) -EXECUTABLE2=$(BN)/$(PROGRAM2) +OBJECT_MAIN2:=$(patsubst %, $(LB)/%.o, $(MAIN2)) +EXECUTABLE2:=$(BN)/$(PROGRAM2) #---------------------------------------------------------------- diff --git a/src/response/Makefile b/src/response/Makefile index 2621a96b4..9f4bfb97d 100644 --- a/src/response/Makefile +++ b/src/response/Makefile @@ -13,15 +13,15 @@ # -PROGRAM1 = responsemanipulator -MAIN1 = MResponseManipulatorMain +PROGRAM1 := responsemanipulator +MAIN1 := MResponseManipulatorMain -PROGRAM2 = responsecreator -MAIN2 = MResponseCreatorMain +PROGRAM2 := responsecreator +MAIN2 := MResponseCreatorMain -LIBRARY = ResponseCreator +LIBRARY := ResponseCreator -FILES = MResponseCreator \ +FILES := MResponseCreator \ MResponseManipulator \ MResponseBuilder \ MResponseBase \ @@ -48,7 +48,7 @@ FILES = MResponseCreator \ MResponseStripPairingTMVAEventFile \ MResponseComptelDataSpace \ -LIBRARIES = \ +LIBRARIES := \ -lRevan \ -lSivan \ -lMimrec \ @@ -62,22 +62,22 @@ 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_MAIN1=$(patsubst %, $(LB)/%.o, $(MAIN1)) -EXECUTABLE1=$(BN)/$(PROGRAM1) +OBJECT_MAIN1:=$(patsubst %, $(LB)/%.o, $(MAIN1)) +EXECUTABLE1:=$(BN)/$(PROGRAM1) -OBJECT_MAIN2=$(patsubst %, $(LB)/%.o, $(MAIN2)) -EXECUTABLE2=$(BN)/$(PROGRAM2) +OBJECT_MAIN2:=$(patsubst %, $(LB)/%.o, $(MAIN2)) +EXECUTABLE2:=$(BN)/$(PROGRAM2) #---------------------------------------------------------------- diff --git a/src/revan/Makefile b/src/revan/Makefile index 0e27f83cb..bc1f16049 100644 --- a/src/revan/Makefile +++ b/src/revan/Makefile @@ -13,13 +13,13 @@ # -PROGRAM = revan +PROGRAM := revan -MAIN = MRevanMain +MAIN := MRevanMain -LIBRARY = Revan +LIBRARY := Revan -FILES = MGeometryRevan \ +FILES := MGeometryRevan \ MRawEventIncarnations \ MRawEventIncarnationList \ MRawEventAnalyzer \ @@ -68,9 +68,9 @@ FILES = MGeometryRevan \ MERStripPairingDataSet \ -LIBRARY_UI = RevanGui +LIBRARY_UI := RevanGui -FILES_UI = \ +FILES_UI := \ MInterfaceRevan \ MGUIRevanMain \ MGUIERAlgorithm \ @@ -84,7 +84,7 @@ FILES_UI = \ MGUIExportSpectrum \ MGUIReconstructedSpectrum \ -LIBRARIES = \ +LIBRARIES := \ -lSivan \ -lGeomega \ -lSpectralyze \ @@ -97,32 +97,32 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #---------------------------------------------------------------- diff --git a/src/sivan/Makefile b/src/sivan/Makefile index 4d5fa0430..f57fbba55 100644 --- a/src/sivan/Makefile +++ b/src/sivan/Makefile @@ -12,13 +12,13 @@ # Base definitions: # -PROGRAM = sivan +PROGRAM := sivan -MAIN = MSivanMain +MAIN := MSivanMain -LIBRARY = Sivan +LIBRARY := Sivan -FILES = MSettingsSivan \ +FILES := MSettingsSivan \ MSimCluster \ MSimHT \ MSimIA \ @@ -30,15 +30,15 @@ FILES = MSettingsSivan \ MSimBinaryOptions \ MFileEventsSim \ -LIBRARY_UI = SivanGui +LIBRARY_UI := SivanGui -FILES_UI = \ +FILES_UI := \ MInterfaceSivan \ MGUISivanMain \ MGUISivanEventSelection \ MGUISivanTracking \ -LIBRARIES = \ +LIBRARIES := \ -lGeomega \ -lCommonMisc \ -lCommonGui \ @@ -48,32 +48,32 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #---------------------------------------------------------------- diff --git a/src/spectralyze/Makefile b/src/spectralyze/Makefile index 47596010a..fb0e6aa81 100644 --- a/src/spectralyze/Makefile +++ b/src/spectralyze/Makefile @@ -12,25 +12,25 @@ # Base definitions: # -PROGRAM = spectralyze +PROGRAM := spectralyze -MAIN = MSpectralyzerMain +MAIN := MSpectralyzerMain -LIBRARY = Spectralyze +LIBRARY := Spectralyze -FILES = MSettingsSpectralyzer \ +FILES := MSettingsSpectralyzer \ MSettingsSpectralOptions \ MSpectralAnalyzer \ MPeak \ MQualifiedIsotope \ -LIBRARY_UI = SpectralyzeGui +LIBRARY_UI := SpectralyzeGui -FILES_UI = \ +FILES_UI := \ MGUISpectralAnalyzer \ -LIBRARIES = \ +LIBRARIES := \ -lGeomega \ -lCommonMisc \ -lCommonGui \ @@ -40,32 +40,32 @@ 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 -OBJECTS_UI=$(patsubst %, $(LB)/%.o, $(FILES_UI)) -HEADERS_UI=$(patsubst %, inc/%.h, $(FILES_UI)) -SHAREDLIB_UI=$(LB)/lib$(LIBRARY_UI).$(DLL) +OBJECTS_UI:=$(patsubst %, $(LB)/%.o, $(FILES_UI)) +HEADERS_UI:=$(patsubst %, inc/%.h, $(FILES_UI)) +SHAREDLIB_UI:=$(LB)/lib$(LIBRARY_UI).$(DLL) -DICTIONARYNAME_UI=$(LIBRARY_UI)_Dictionary -DICTIONARY_UI=$(LB)/$(DICTIONARYNAME_UI).cxx -DICTIONARYOBJECT_UI=$(LB)/$(DICTIONARYNAME_UI).o -LINKDEF_UI=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h -ROOTMAP_UI=$(LB)/lib$(LIBRARY_UI).rootmap -ROOTPCM_UI=lib$(LIBRARY_UI)_rdict.pcm +DICTIONARYNAME_UI:=$(LIBRARY_UI)_Dictionary +DICTIONARY_UI:=$(LB)/$(DICTIONARYNAME_UI).cxx +DICTIONARYOBJECT_UI:=$(LB)/$(DICTIONARYNAME_UI).o +LINKDEF_UI:=$(LB)/$(DICTIONARYNAME_UI)_LinkDef.h +ROOTMAP_UI:=$(LB)/lib$(LIBRARY_UI).rootmap +ROOTPCM_UI:=lib$(LIBRARY_UI)_rdict.pcm -OBJECT_MAIN=$(patsubst %, $(LB)/%.o, $(MAIN)) -EXECUTABLE=$(BN)/$(PROGRAM) +OBJECT_MAIN:=$(patsubst %, $(LB)/%.o, $(MAIN)) +EXECUTABLE:=$(BN)/$(PROGRAM) #----------------------------------------------------------------