[cgma-dev] r6023 - in cgm/trunk: amendment geom geom/Cholla geom/OCC geom/facet geom/facetbool geom/virtual util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-03-05 13:40:36 -0600 (Tue, 05 Mar 2013)
New Revision: 6023

Modified:
   cgm/trunk/amendment/Makefile.am
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/Makefile.am
   cgm/trunk/geom/OCC/Makefile.am
   cgm/trunk/geom/facet/Makefile.am
   cgm/trunk/geom/facetbool/Makefile.am
   cgm/trunk/geom/virtual/Makefile.am
   cgm/trunk/util/Makefile.am
Log:
Change the libraries back to installed libraries, fixed the shared build issue.

Modified: cgm/trunk/amendment/Makefile.am
===================================================================
--- cgm/trunk/amendment/Makefile.am	2013-03-04 04:14:27 UTC (rev 6022)
+++ cgm/trunk/amendment/Makefile.am	2013-03-05 19:40:36 UTC (rev 6023)
@@ -3,7 +3,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/geom -I$(top_srcdir)/util -I.
 
-noinst_LTLIBRARIES = libcgma_amendment.la
+lib_LTLIBRARIES = libcgma_amendment.la
 libcgma_amendment_la_includedir = $(includedir)
 libcgma_amendment_la_SOURCES = AutoMidsurfaceTool.cpp \
     CAEntityTol.cpp \

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2013-03-04 04:14:27 UTC (rev 6022)
+++ cgm/trunk/geom/Cholla/Makefile.am	2013-03-05 19:40:36 UTC (rev 6023)
@@ -5,9 +5,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom
 
 # The name of the library to build
-noinst_LTLIBRARIES = 
+lib_LTLIBRARIES = 
 if BUILD_CGM
-  noinst_LTLIBRARIES += libCholla.la
+  lib_LTLIBRARIES += libCholla.la
 endif
 
 # The directory where headers will be installed

Modified: cgm/trunk/geom/Makefile.am
===================================================================
--- cgm/trunk/geom/Makefile.am	2013-03-04 04:14:27 UTC (rev 6022)
+++ cgm/trunk/geom/Makefile.am	2013-03-05 19:40:36 UTC (rev 6023)
@@ -20,9 +20,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/amendment -I.
 
 # The name of the library to build
-noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
 if BUILD_CGM
-  noinst_LTLIBRARIES += libcubit_geom.la
+  lib_LTLIBRARIES += libcubit_geom.la
 endif
 
 # The directory where headers will be installed

Modified: cgm/trunk/geom/OCC/Makefile.am
===================================================================
--- cgm/trunk/geom/OCC/Makefile.am	2013-03-04 04:14:27 UTC (rev 6022)