[cgma-dev] r5798 - in cgm/trunk: cgm_apps/examples/facetdriver test

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-10-15 11:49:47 -0500 (Mon, 15 Oct 2012)
New Revision: 5798

Modified:
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/test/Makefile.am
Log:
Should satisfy the 'make check' before 'make install' request.

Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2012-10-15 16:16:32 UTC (rev 5797)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2012-10-15 16:49:47 UTC (rev 5798)
@@ -13,5 +13,4 @@
                -I$(top_srcdir)/geom/facet \
                -I$(top_srcdir)/geom/facetbool
 
-LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) 
-AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)  -lcubit_geom -lcubit_util -lcubit_facetbool -lcubit_facet -lCholla -lcubit_virtual -ldl
+LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) 

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2012-10-15 16:16:32 UTC (rev 5797)
+++ cgm/trunk/test/Makefile.am	2012-10-15 16:49:47 UTC (rev 5798)
@@ -27,8 +27,7 @@
 
 check_PROGRAMS = $(TESTS)
 
-LDADD = ../libcgm.la libcgm_test.la $(CGM_EXT_LIBS) 
-AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) -lcubit_geom -lcubit_util -lcubit_virtual -lcubit_facet
+LDADD = ../libcgm.la libcgm_test.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
 
 noinst_LTLIBRARIES = libcgm_test.la
 libcgm_test_la_SOURCES = TestUtilities.hpp \