Changeset 1045 for trunk/config/binmake.gmk

Timestamp:

May 15, 2009, 12:28:43 PM (15 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

File:

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

trunk/config/binmake.gmk

@@ -1 @@
-# $Id: binmake.gmk,v 1.138 2008/11/14 19:58:19 gcosmo Exp $
+# $Id: binmake.gmk,v 1.139 2008/12/03 13:35:36 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
@@ -34 +34 @@
 # Verify the existance of granular shared libraries (Unix) or global DLLs (Windows)
 #
+ifndef SHAREDLIBS
+  SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/libG4globman.$(SHEXT) && echo yes)
+endif
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
   SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
@@ -273 +276 @@
 # (why?) the user is not supposed to be able to define...
 #
-LDLIBS5 += $(LOADLIBS)
+LDLIBS4 += $(LOADLIBS)
 
 # Finally assemble libraries...
@@ -282 +285 @@
 else
 # Again, do not use := or +=.  See note on LDLIBS2 above.
-  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
 # Version leaving out EXTRALIBS 
-  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
-endif
-LDLIBS_PREFINAL += $(LDLIBS5)
-LDLIBS_KERNEL   += $(LDLIBS5)
+  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+endif
+LDLIBS_PREFINAL += $(LDLIBS4)
+LDLIBS_KERNEL   += $(LDLIBS4)
 
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
@@ -351 +354 @@
 ifdef CPPVERBOSE
         $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)  \
+          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
           $(LDLIBS)
 else
         @echo Linking $(G4TARGET) ...
         @$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS)\
+          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
           $(LDLIBS)
         @if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
@@ -368 +371 @@
 $(G4TMPDIR)/exe/obj.last: $(objects)
 endif
-        @touch $@
+        @$(TOUCH) $@
 
 # Make the $(G4TARGET).$(TARGOBJEXT) file.