Changeset 3014 in Sophya for trunk/SophyaLib

Timestamp:

Jul 11, 2006, 4:51:05 PM (19 years ago)

Author:

ansari

Message:

Prise en compte du flag de compil SINGLE_SLB ds CxxCompilerLinker et MAJ makefile pour sspvflags.h , Reza 11/7/2006

Location:

trunk/SophyaLib/SysTools

Files:

• Makefile (modified) (1 diff)
• cxxcmplnk.cc (modified) (3 diffs)
• smakefile (modified) (1 diff)

trunk/SophyaLib/SysTools/Makefile

@@ -45 +45 @@
 $(SOPHYAOBJP)cxxcmplnk.o: cxxcmplnk.cc \
   $(SOPHYAINCP)sopnamsp.h cxxcmplnk.h \
-  $(SOPHYAINCP)machdefs.h
+  $(SOPHYAINCP)sspvflags.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  cxxcmplnk.cc
  

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -4 +4 @@
 #include "sopnamsp.h"
 #include "cxxcmplnk.h"
+#include "sspvflags.h"
 #include <iostream>
 
@@ -167 +168 @@
     cout << " CxxCompilerLinker()/Warning : both SOPHYABASE and SOPHYABASEREP defined" << endl;
 
-  if (fglibsophya) linkOptions += " -lsophya ";
-  if (fglibextsophya) linkOptions += " -lextsophya ";
-#if defined( AIX )
-  cout << " ++++==++ DBG/CxxCompilerLinker() - in AIX fglibpi= " 
+#if defined( SINGLESLB_SOPHYA_PI_EXT )
+  if (fglibsophya || fglibpi) linkOptions += " -lAsophyaextPI ";
+  /*
+  cout << " +++ DBG/CxxCompilerLinker() - in AIX fglibpi= " 
        << ((fglibpi) ? " true " : " false ")  << endl;
   // Reza:Dec 2005 : pb avec les programmes PI sur AIX si linke avec shared lib PI
@@ -178 +179 @@
     linkOptions += " -lPIext -lPIGcont -lPI -lXm -lXt -lX11 -lpthread ";
   }
+  */
+  cout << "CxxCompilerLinker()/Warning: SINGLESLB_SOPHYA_PI_EXT -> linkOptions= " << linkOptions << endl; 
 #else
+  if (fglibsophya) linkOptions += " -lsophya ";
+  if (fglibextsophya) linkOptions += " -lextsophya ";
   if (fglibpi) linkOptions += " -lPI ";
 #endif

trunk/SophyaLib/SysTools/smakefile

@@ -45 +45 @@
 $(SOPHYAOBJP)cxxcmplnk.o: cxxcmplnk.cc \
   $(SOPHYAINCP)sopnamsp.h cxxcmplnk.h \
-  $(SOPHYAINCP)machdefs.h
+  $(SOPHYAINCP)sspvflags.h $(SOPHYAINCP)machdefs.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  cxxcmplnk.cc