Changeset 1195 for trunk/config/binmake.gmk

Timestamp:

Nov 25, 2009, 5:02:54 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

File:

• trunk/config/binmake.gmk (modified) (6 diffs)

trunk/config/binmake.gmk

@@ -1 @@
-# $Id: binmake.gmk,v 1.141 2009/06/17 16:37:41 gunter Exp $
+# $Id: binmake.gmk,v 1.143 2009/11/17 15:17:17 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
@@ -87 +87 @@
               -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include \
               -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/processes/include \
+              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/xs_dependent/include \
               -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
               -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
@@ -231 +235 @@
              -lG4intercoms \
              -lG4global
+
+  ifdef G4LIB_USE_ZLIB
+    LDLIBS2 += -lG4zlib
+  endif
+
 else
 # The next lines specifically should read LDLIBS2 = , not LDLIBS2 :=, so
@@ -257 +266 @@
 endif
 
-ifdef G4LIB_USE_ZLIB
-  LDLIBS2 += -lG4zlib
-endif
-
 # LDLIBS3 contains the first set of low level libraries...
 #
@@ -336 +341 @@
   ifndef GLOBALLIBS
         @echo "Using granular libraries ..."
+        @echo $(G4TMP)
         @if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
           -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
@@ -353 +359 @@
         @if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
 ifdef CPPVERBOSE
-        echo Linking 1 $(LDLIBS1); \
-        echo Linking 2 $(LDLIBS2); \
-        echo Linking 3 $(LDLIBS3); \
-        echo Linking 4 $(LDLIBS4); \
-        echo G4TMPDIR $(G4TMPDIR); \
-
         $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
           $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \