[cgma-dev] r1754 - cgm/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-04-10 11:17:17 -0500 (Thu, 10 Apr 2008)
New Revision: 1754

Modified:
   cgm/trunk/cgm.make.in
   cgm/trunk/configure.in
Log:
o Handle libcgma_init like all other CGM libraries

o Remove bogus linker search paths for libcgma_init

o Reference .la files rather than .a files in CGM_LIBS_FILES
  because a) the .a files won't exist if shared libraries are 
  built, b) the .la will get a new timestamp whenever either
  the .a or the .so is updated and c) this variable is presumably
  only used in dependency lists so any file with an appropriate
  timestamp should suffice.


Modified: cgm/trunk/cgm.make.in
===================================================================
--- cgm/trunk/cgm.make.in	2008-04-09 18:02:53 UTC (rev 1753)
+++ cgm/trunk/cgm.make.in	2008-04-10 16:17:17 UTC (rev 1754)
@@ -56,6 +56,8 @@
                ${OCC_INCLUDES}
 
 CGM_LIBS_LINK_INTERNAL = ${LDFLAGS} \
+	-L$(CGM_LIBDIR) \
+        -L$(CGM_LIBDIR)/init/.libs \
 	-L$(CGM_LIBDIR)/geom/virtual/.libs \
         -L$(CGM_LIBDIR)/geom/facetbool/.libs \
         -L$(CGM_LIBDIR)/geom/facet/.libs \
@@ -72,8 +74,8 @@
         -L$(CGM_LIBDIR)/geom \
         -L$(CGM_LIBDIR)/util \
 	-L${ACIS_LIB_DIR} \
-	-L$(CGM_LIBDIR) \
         ${OCC_LIB_DIR} \
+        -lcgma_init \
 	${ACIS_LIBS} \
         -lcubit_virtual \
         -lcubit_facet \
@@ -86,20 +88,21 @@
         ${OCC_LIBS} 
 
 CGM_LIBS_FILES_INTERNAL = \
-       $(CGM_LIBDIR)/libcubit_virtual.a \
-       $(CGM_LIBDIR)/libcubit_facetbool.a \
-       $(CGM_LIBDIR)/libcubit_facet.a \
-       $(CGM_LIBDIR)/libcholla.a \
-       $(CGM_LIBDIR)/libcubit_geom.a \
-       $(CGM_LIBDIR)/libcubit_util.a \
+       $(CGM_LIBDIR)/libcgma_init.la \
+       $(CGM_LIBDIR)/libcubit_virtual.la \
+       $(CGM_LIBDIR)/libcubit_facetbool.la \
+       $(CGM_LIBDIR)/libcubit_facet.la \
+       $(CGM_LIBDIR)/libcholla.la \
+       $(CGM_LIBDIR)/libcubit_geom.la \
+       $(CGM_LIBDIR)/libcubit_util.la \
        ${CGM_PARALLEL_LIB_FILE}
-
+       
 CUBIT_LDFwAGS = @CUBIT_LDFLAGS@
 
 CUBIT_LTFLAGS = @CUBIT_LTFLAGS@
 CUBIT_LIBS = @CUBIT_LIBS@
 CUBIT_FILE = @CUBIT_FILE@
 
-CGM_LIBS_LINK = -L$(CGM_LIBDIR)/init -L$(CGM_LIBDIR)/init/.libs -lcgma_init @CGM_LIBS_LINK@  
-CGM_LIBS_FILES = @CGM_LIBS_FILES@ $(CGM_LIBDIR)/libcgma_init.a
+CGM_LIBS_LINK = @CGM_LIBS_LINK@  
+CGM_LIBS_FILES = @CGM_LIBS_FILES@ 
 CGM_LIBS_LTFLAGS = @CGM_LIBS_LTFLAGS@

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-04-09 18:02:53 UTC (rev 1753)
+++ cgm/trunk/configure.in	2008-04-10 16:17:17 UTC (rev 1754)
@@ -32,7 +32,7 @@
   CXXFLAGS="$CXXFLAGS -DUSE_MPI"
   CGM_PARALLEL_INCLUDE='-I${CGM_DIR}/geom/parallel'
   CGM_PARALLEL_LIB='-L${CGM_DIR}/geom/parallel -lcubit_parallel'
-  CGM_PARALLEL_LIB_FILE='${CGM_LIBDIR}/libcubit_parallel.a'
+  CGM_PARALLEL_LIB_FILE='${CGM_LIBDIR}/libcubit_parallel.la'
 fi
 AM_CONDITIONAL(USE_MPI, [test "xno" != "x$WITH_MPI"])
 AC_SUBST(CGM_PARALLEL_INCLUDE)