<html><head><style type='text/css'>p { margin: 0; }</style></head><body><div style='font-family: times new roman,new york,times,serif; font-size: 12pt; color: #000000'>Sorry about these commits; <br>the commit message was about merge-cubit12.2, while in fact I was on cubit-merge12 branch.<br>It will not hurt cubit-merge12 branch though;<br>although this one should be discontinued; and it confused me because its name was very close to cubit-merge12.2 .<br><br><br>Best Regards,<br>Iulian<br><br><hr id="zwchr"><div style="color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><b>From: </b>iulian@mcs.anl.gov<br><b>To: </b>cgma-dev@mcs.anl.gov<br><b>Sent: </b>Friday, March 15, 2013 4:33:06 PM<br><b>Subject: </b>[cgma-dev] r6032 - in cgm/branches/merge-cubit12: cgm_apps/examples/facetdriver geom/testing<br><br>Author: iulian<br>Date: 2013-03-15 16:33:05 -0500 (Fri, 15 Mar 2013)<br>New Revision: 6032<br><br>Modified:<br> cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am<br> cgm/branches/merge-cubit12/geom/testing/Makefile.am<br>Log:<br>forgot these two changes at the previous commit<br><br>on mergecubit12.2 branch, shared build, we need this for ubuntu 12.04<br>(because of golden linker rule, dependent libraries need to be explicit)<br><br><br><br><br>Modified: cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am<br>===================================================================<br>--- cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031)<br>+++ cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032)<br>@@ -11,4 +11,4 @@<br> -I$(top_srcdir)/geom/Cholla \<br> -I$(top_srcdir)/geom/facet<br> <br>-LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)<br>+LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS)<br><br>Modified: cgm/branches/merge-cubit12/geom/testing/Makefile.am<br>===================================================================<br>--- cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:00:25 UTC (rev 6031)<br>+++ cgm/branches/merge-cubit12/geom/testing/Makefile.am 2013-03-15 21:33:05 UTC (rev 6032)<br>@@ -14,7 +14,7 @@<br> endif<br> <br> AM_CPPFLAGS += -I$(top_srcdir)/util -I$(top_srcdir)/geom -I.<br>-LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)<br>+LDADD = libcgm_test.la ../../libcgm.la $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(CGM_EXT_LIBS)<br> <br> SUFFIXES = .acis .occ<br> check_PROGRAMS = $(BASE_TESTS:.engine=)<br><br></div><br></div></body></html>