Changeset 921 for trunk/config/binmake.gmk

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

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

trunk/config/binmake.gmk

@@ -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)
@@ -276 +273 @@
 # (why?) the user is not supposed to be able to define...
 #
-LDLIBS4 += $(LOADLIBS)
+LDLIBS5 += $(LOADLIBS)
 
 # Finally assemble libraries...
@@ -285 +282 @@
 else
 # Again, do not use := or +=.  See note on LDLIBS2 above.
-  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
+  LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
 # Version leaving out EXTRALIBS 
-  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
-endif
-LDLIBS_PREFINAL += $(LDLIBS4)
-LDLIBS_KERNEL   += $(LDLIBS4)
+  LDLIBS_KERNEL   = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) $(LDLIBS4)
+endif
+LDLIBS_PREFINAL += $(LDLIBS5)
+LDLIBS_KERNEL   += $(LDLIBS5)
 
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
@@ -354 +351 @@
 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 \