Changeset bd0a1aa in git for doc

Timestamp:

Jun 13, 2016, 1:42:30 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

29d662e

Parents:

4a0d9d5 (diff), 83e60eb (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' into dev_01

File:

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

doc/genMakefile.tcl

@@ -72 +72 @@
     dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
 
+    puts -nonewline $dictName$pcmSuf:$suffix
+    puts -nonewline $dictName$srcSuf
+    puts {}
+
     puts -nonewline [file tail $dictName$pcmSuf]:$suffix
-    puts -nonewline $dictName$pcmSuf$suffix
-    puts -nonewline $dictName$srcSuf
+    puts -nonewline $dictName$pcmSuf
     puts {}
   }
@@ -416 +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 $< $@