Changeset d870fc5 in git for doc/genMakefile.tcl

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

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

doc/genMakefile.tcl

@@ -57 +57 @@
   global prefix suffix srcSuf objSuf pcmSuf
 
-  set dict [eval glob -nocomplain $args]
+  set dict [lsort [eval glob -nocomplain $args]]
 
   set dictSrcFiles {}
@@ -91 +91 @@
   global prefix suffix srcSuf objSuf
 
-  set source [eval glob -nocomplain $args]
+  set source [lsort [eval glob -nocomplain $args]]
 
   set srcObjFiles {}
@@ -127 +127 @@
   global prefix suffix srcSuf objSuf
 
-  set source [glob -nocomplain {external/tcl/*.c}]
+  set source [lsort [glob -nocomplain {external/tcl/*.c}]]
 
   set srcObjFiles {}
@@ -151 +151 @@
   global prefix suffix objSuf exeSuf
 
-  set executable [eval glob -nocomplain $args]
+  set executable [lsort [eval glob -nocomplain $args]]
 
   set exeFiles {}
@@ -229 +229 @@
 
 ifneq ($(PYTHIA8),)
-HAS_PYTHIA8 = true
-CXXFLAGS += -I$(PYTHIA8)/include
-OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
-else
-ifneq ($(PYTHIA8DATA),)
-HAS_PYTHIA8 = true
-CXXFLAGS += -I$(PYTHIA8DATA)/../include
-OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
-endif
+#HAS_PYTHIA8 = true
+#CXXFLAGS += -I$(PYTHIA8)/include
+#CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
+#OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
 endif
 
@@ -401 +396 @@
         @echo ">> Building $(DISTTAR)"
         @mkdir -p $(DISTDIR)
-        @cp -a CHANGELOG CREDITS README VERSION Makefile configure classes converters display doc examples external modules python readers $(DISTDIR)
+        @cp -a CHANGELOG COPYING CREDITS README VERSION Makefile configure cards classes converters display doc examples external modules python readers $(DISTDIR)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)