[cgma-dev] r6032 - in cgm/branches/merge-cubit12: cgm_apps/examples/facetdriver geom/testing

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-03-15 16:33:05 -0500 (Fri, 15 Mar 2013)
New Revision: 6032

Modified:
   cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am
   cgm/branches/merge-cubit12/geom/testing/Makefile.am
Log:
forgot these two changes at the previous commit

on mergecubit12.2 branch, shared build, we need this for ubuntu 12.04
(because of golden linker rule, dependent libraries need to be explicit)




Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am	2013-03-15 21:00:25 UTC (rev 6031)
+++ cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am	2013-03-15 21:33:05 UTC (rev 6032)
@@ -11,4 +11,4 @@
                -I$(top_srcdir)/geom/Cholla \
                -I$(top_srcdir)/geom/facet
 
-LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
+LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS)

Modified: cgm/branches/merge-cubit12/geom/testing/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12/geom/testing/Makefile.am	2013-03-15 21:00:25 UTC (rev 6031)
+++ cgm/branches/merge-cubit12/geom/testing/Makefile.am	2013-03-15 21:33:05 UTC (rev 6032)
@@ -14,7 +14,7 @@
 endif
 
 AM_CPPFLAGS += -I$(top_srcdir)/util -I$(top_srcdir)/geom -I.
-LDADD = libcgm_test.la ../../libcgm.la  $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
+LDADD = libcgm_test.la ../../libcgm.la  $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS)
 
 SUFFIXES = .acis .occ
 check_PROGRAMS = $(BASE_TESTS:.engine=)