Changes in doc/genMakefile.tcl [2eb25b1:6427420] in git

File:

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

doc/genMakefile.tcl

@@ -53 +53 @@
 }
 
-proc dictDeps {dictPrefix args} {
+proc dictDeps {dictVar args} {
 
   global prefix suffix srcSuf objSuf pcmSuf
@@ -78 +78 @@
   }
 
-  puts -nonewline "${dictPrefix}_OBJ += $suffix"
+  puts -nonewline "${dictVar} += $suffix"
+  puts [join $dictSrcFiles $suffix]
+  puts {}
+
+  puts -nonewline "${dictVar}_OBJ += $suffix"
   puts [join $dictObjFiles $suffix]
   puts {}
 
-  puts -nonewline "${dictPrefix}_PCM += $suffix"
+  puts -nonewline "${dictVar}_PCM += $suffix"
   puts [join $dictPcmFiles $suffix]
   puts {}
@@ -94 +98 @@
 
   set srcObjFiles {}
-  set srcObjFilesFastJet {}
   set srcObjFilesPythia8 {}
 
@@ -103 +106 @@
     if {$fileName == "modules/PileUpMergerPythia8.cc"} {
       lappend srcObjFilesPythia8 $srcObjName$objSuf
-    } elseif {[string match {modules/FastJet*.cc} $fileName] && $srcPrefix != {FASTJET}} {
-      continue
     } else {
       lappend srcObjFiles $srcObjName$objSuf
@@ -245 +246 @@
 ###
 
-NOFASTJET = libDelphesNoFastJet.$(DllSuf)
-NOFASTJETLIB = libDelphesNoFastJet.lib
-
 DELPHES = libDelphes.$(DllSuf)
 DELPHESLIB = libDelphes.lib
@@ -284 +282 @@
 dictDeps {DELPHES_DICT} {classes/ClassesLinkDef.h} {modules/ModulesLinkDef.h} {external/ExRootAnalysis/ExRootAnalysisLinkDef.h}
 
-dictDeps {FASTJET_DICT} {modules/FastJetLinkDef.h}
-
 dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
 
-sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc}
-
-sourceDeps {FASTJET} {modules/FastJet*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc} 
+sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc} {external/Hector/*.cc}
 
 sourceDeps {DISPLAY} {display/*.cc}
@@ -303 +297 @@
 
 ifeq ($(ROOT_MAJOR),6)
-all: $(NOFASTJET) $(DELPHES) $(DELPHES_DICT_PCM) $(FASTJET_DICT_PCM) $(EXECUTABLE)
+all: $(DELPHES) $(DELPHES_DICT_PCM) $(EXECUTABLE)
 display: $(DISPLAY) $(DISPLAY_DICT_PCM)
 else
-all: $(NOFASTJET) $(DELPHES) $(EXECUTABLE)
+all: $(DELPHES) $(EXECUTABLE)
 display: $(DISPLAY)
 endif
 
-$(NOFASTJET): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
+$(DELPHES): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
         @mkdir -p $(@D)
         @echo ">> Building $@"
@@ -327 +321 @@
 ifeq ($(PLATFORM),win32)
         @bindexplib $* $^ > $*.def
-        @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(NOFASTJETLIB)
-        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
-        @$(MT_DLL)
-else
-        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
-        @$(MT_DLL)
-endif
-endif
-endif
-
-$(DELPHES): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(TCL_OBJ)
-        @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)
-        @bindexplib $* $^ > $*.def
         @lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DELPHESLIB)
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
@@ -364 +331 @@
 endif
 
-$(DISPLAY): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ)
+$(DISPLAY): $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ)
         @mkdir -p $(@D)
         @echo ">> Building $@"
@@ -392 +359 @@
 
 clean:
-        @rm -f $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ) core
+        @rm -f $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ) core
         @rm -rf tmp
 
 distclean: clean
-        @rm -f $(NOFASTJET) $(NOFASTJETLIB) $(DELPHES) $(DELPHESLIB) $(DELPHES_DICT_PCM) $(FASTJET_DICT_PCM) $(DISPLAY) $(DISPLAYLIB) $(DISPLAY_DICT_PCM) $(EXECUTABLE)
+        @rm -f $(DELPHES) $(DELPHESLIB) $(DELPHES_DICT_PCM) $(DISPLAY) $(DISPLAYLIB) $(DISPLAY_DICT_PCM) $(EXECUTABLE)
 
 dist:
@@ -429 +396 @@
         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(FASTJET_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
+$(DISPLAY_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
         @mkdir -p $(@D)
         @echo ">> Compiling $<"
         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(DISPLAY_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
+$(DELPHES_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
         @mkdir -p $(@D)
         @echo ">> Compiling $<"
         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(DELPHES_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
+$(DISPLAY_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
         @mkdir -p $(@D)
         @echo ">> Compiling $<"
         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(FASTJET_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
+$(TCL_OBJ): tmp/%.$(ObjSuf): %.c
+        @mkdir -p $(@D)
+        @echo ">> Compiling $<"
+        @$(CC) $(patsubst -std=%,,$(CXXFLAGS)) -c $< $(OutPutOpt)$@
+
+$(EXECUTABLE_OBJ): tmp/%.$(ObjSuf): %.cpp
         @mkdir -p $(@D)
         @echo ">> Compiling $<"
         @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(DISPLAY_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
-        @mkdir -p $(@D)
-        @echo ">> Compiling $<"
-        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
-$(TCL_OBJ): tmp/%.$(ObjSuf): %.c
-        @mkdir -p $(@D)
-        @echo ">> Compiling $<"
-        @$(CC) $(patsubst -std=%,,$(CXXFLAGS)) -c $< $(OutPutOpt)$@
-
-$(EXECUTABLE_OBJ): tmp/%.$(ObjSuf): %.cpp
-        @mkdir -p $(@D)
-        @echo ">> Compiling $<"
-        @$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
-$(EXECUTABLE): %$(ExeSuf): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(TCL_OBJ)
+$(EXECUTABLE): %$(ExeSuf): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
         @echo ">> Building $@"
         @$(LD) $(LDFLAGS) $^ $(DELPHES_LIBS) $(OutPutOpt)$@