Changeset 83e60eb in git

Timestamp:

Jun 9, 2016, 9:43:39 AM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

abab212, bd0a1aa

Parents:

0a6c72b (diff), 7955405 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

Files:

• Makefile (modified) (1 diff)
• doc/genMakefile.tcl (modified) (1 diff)

Makefile

@@ -2108 +2108 @@
         @rm $@.arch $@.base
 
-%Dict$(PcmSuf):
+$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
         @echo ">> Copying $@"
         @cp $< $@

doc/genMakefile.tcl

@@ -419 +419 @@
         @rm $@.arch $@.base
 
-%Dict$(PcmSuf):
+$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
         @echo ">> Copying $@"
         @cp $< $@