Changes in doc/genMakefile.tcl [910bd98:cdbca0d] in git

File:

• doc/genMakefile.tcl (modified) (10 diffs)

doc/genMakefile.tcl

@@ -282 +282 @@
 DISPLAYLIB = libDelphesDisplay.lib
 
-VERSION = x.y.z
+VERSION = $(shell cat VERSION)
 DISTDIR = Delphes-$(VERSION)
 DISTTAR = $(DISTDIR).tar.gz
@@ -292 +292 @@
 executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp}
 
-executableDeps {readers/DelphesHepMC2.cpp} {readers/DelphesHepMC3.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
+executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
 
 puts {ifeq ($(HAS_CMSSW),true)}
@@ -321 +321 @@
 dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
 
-sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc} {external/TrackCovariance/*.cc}
+sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc}
 
 sourceDeps {FASTJET} {modules/FastJet*.cc} {modules/RunPUPPI.cc} {external/PUPPI/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc}
@@ -346 +346 @@
         @mkdir -p $(@D)
         @echo ">> Building $@"
+ifeq ($(ARCH),aix5)
+        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
+else
 ifeq ($(PLATFORM),macosx)
+# We need to make both the .dylib and the .so
         @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
+endif
+endif
 else
 ifeq ($(PLATFORM),win32)
@@ -356 +365 @@
 else
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+        @$(MT_DLL)
+endif
 endif
 endif
@@ -362 +373 @@
         @mkdir -p $(@D)
         @echo ">> Building $@"
+ifeq ($(ARCH),aix5)
+        @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^
+else
 ifeq ($(PLATFORM),macosx)
+# We need to make both the .dylib and the .so
         @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
+endif
+endif
 else
 ifeq ($(PLATFORM),win32)
@@ -372 +392 @@
 else
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+        @$(MT_DLL)
+endif
 endif
 endif
@@ -378 +400 @@
         @mkdir -p $(@D)
         @echo ">> Building $@"
+ifeq ($(ARCH),aix5)
+        @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^
+else
 ifeq ($(PLATFORM),macosx)
+# We need to make both the .dylib and the .so
         @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
+endif
+endif
 else
 ifeq ($(PLATFORM),win32)
@@ -388 +419 @@
 else
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
+        @$(MT_DLL)
+endif
 endif
 endif
@@ -401 +434 @@
         @echo ">> Building $(DISTTAR)"
         @mkdir -p $(DISTDIR)
-        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb Makefile MinBias.pileup configure cards classes cmake converters display doc examples external modules python readers validation $(DISTDIR)
+        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)