[cgma-dev] r6111 - in cgm/trunk: geom/Cholla geom/facetbool geom/virtual util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-12-12 10:38:18 -0600 (Thu, 12 Dec 2013)
New Revision: 6111

Modified:
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/facetbool/Makefile.am
   cgm/trunk/geom/virtual/Makefile.am
   cgm/trunk/util/Makefile.am
Log:
changed the library build for 4 directories from lib_LTLIBRARIES to noinst_LTLIBRARIES, which forced them to be installed inside cgm library for shared build.

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2013-12-07 15:13:37 UTC (rev 6110)
+++ cgm/trunk/geom/Cholla/Makefile.am	2013-12-12 16:38:18 UTC (rev 6111)
@@ -5,9 +5,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom
 
 # The name of the library to build
-lib_LTLIBRARIES = 
+noinst_LTLIBRARIES = 
 if BUILD_CGM
-  lib_LTLIBRARIES += libCholla.la
+  noinst_LTLIBRARIES += libCholla.la
 endif
 
 # The directory where headers will be installed

Modified: cgm/trunk/geom/facetbool/Makefile.am
===================================================================
--- cgm/trunk/geom/facetbool/Makefile.am	2013-12-07 15:13:37 UTC (rev 6110)
+++ cgm/trunk/geom/facetbool/Makefile.am	2013-12-12 16:38:18 UTC (rev 6111)
@@ -7,9 +7,9 @@
            -I$(top_srcdir)/geom 
 
 # The name of the library to build
-lib_LTLIBRARIES = 
+noinst_LTLIBRARIES = 
 if BUILD_CGM
-  lib_LTLIBRARIES += libcubit_facetbool.la
+  noinst_LTLIBRARIES += libcubit_facetbool.la
 endif
 
 # The directory where headers will be installed

Modified: cgm/trunk/geom/virtual/Makefile.am
===================================================================
--- cgm/trunk/geom/virtual/Makefile.am	2013-12-07 15:13:37 UTC (rev 6110)
+++ cgm/trunk/geom/virtual/Makefile.am	2013-12-12 16:38:18 UTC (rev 6111)
@@ -9,15 +9,14 @@
            -I$(top_srcdir)/geom/Cholla
 
 # The name of the library to build
-lib_LTLIBRARIES = 
+noinst_LTLIBRARIES = 
 if BUILD_CGM
-  lib_LTLIBRARIES += libcubit_virtual.la
+  noinst_LTLIBRARIES += libcubit_virtual.la
 endif
 
 # The directory where headers will be installed
 libcubit_virtual_la_includedir = $(includedir)