Changeset 1303 for trunk

Timestamp:

Jun 2, 2010, 3:34:03 PM (14 years ago)

Author:

garnier

Message:

...

Location:

trunk/config

Files:

• History (modified) (2 diffs)
• architecture.gmk (modified) (3 diffs)
• binmake.gmk (modified) (2 diffs)

trunk/config/History

@@ -1 @@
-cvs log $Id: History,v 1.370 2009/11/18 17:33:22 gcosmo Exp $
+cvs log $Id: History,v 1.372 2009/11/25 14:20:40 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      ----------------------------------------------------------
 
-10th December 2009  Laurent Garnier
--Remove old XAW driver
- 
+25th November 2009  Ben Morgan (config-V09-02-17)
+- Updated internal scripts for Configure.
+
+20th November 2009  Gabriele Cosmo (config-V09-02-16)
+- Removed CHIPS/xs_dependent module from include paths.
+
 18th November 2009  Gabriele Cosmo (config-V09-02-15)
 - architecture.gmk: corrected inclusion of -lz for zlib.

trunk/config/architecture.gmk

@@ -1 @@
-# $Id: architecture.gmk,v 1.120 2009/01/26 11:08:02 gcosmo Exp $
+# $Id: architecture.gmk,v 1.121 2009/11/18 17:27:38 gcosmo Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
@@ -14 +14 @@
 # the environment variable G4SYSTEM:
 #
-#          Linux-g++   Linux (Red Hat Enterprise/SCL4), gcc-3.4.6 (default)
-#
-#          Darwin-g++  MacOSX 10.5, gcc-4.0.1
+#          Linux-g++   Linux (Red Hat Enterprise/SCL5), gcc-4.1.2 (default)
+#
+#          Darwin-g++  MacOSX 10.6, gcc-4.2.1
 #
 #          WIN32-VC    Windows/XP and Microsoft Visual C++ 9.0
@@ -214 +214 @@
 else
   LDFLAGS   += -L$(CLHEP_LIB_DIR)
-  LOADLIBS  := -l$(CLHEP_LIB)
-  LOADLIBS  += -lm
-  ifdef G4LIB_USE_ZLIB
-    ifndef G4LIB_BUILD_ZLIB
-      LOADLIBS += -lz
-    endif
+  LOADLIBS  := -l$(CLHEP_LIB) -lm
+  ifndef G4LIB_USE_ZLIB
+    LOADLIBS += -lz
   endif
 endif

trunk/config/binmake.gmk

@@ -1 @@
-# $Id: binmake.gmk,v 1.143 2009/11/17 15:17:17 gcosmo Exp $
+# $Id: binmake.gmk,v 1.144 2009/11/20 11:09:18 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
@@ -91 +91 @@
               -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 \