[cgma-dev] r5803 - in cgm/trunk: geom itaps

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-10-17 13:52:04 -0500 (Wed, 17 Oct 2012)
New Revision: 5803

Modified:
   cgm/trunk/geom/Makefile.am
   cgm/trunk/itaps/Makefile.am
Log:
These changes made the cgm-cubit make check fail on both itaps and test directory, instead of crash on link problems.

Modified: cgm/trunk/geom/Makefile.am
===================================================================
--- cgm/trunk/geom/Makefile.am	2012-10-17 18:32:12 UTC (rev 5802)
+++ cgm/trunk/geom/Makefile.am	2012-10-17 18:52:04 UTC (rev 5803)
@@ -25,6 +25,8 @@
 # The directory where headers will be installed
 libcubit_geom_la_includedir = $(includedir)
 
+LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/util/libcubit_util.la
+
 # The non-template sources
 libcubit_geom_la_SOURCES = \
     AllocMemManagersGeom.cpp \

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2012-10-17 18:32:12 UTC (rev 5802)
+++ cgm/trunk/itaps/Makefile.am	2012-10-17 18:52:04 UTC (rev 5803)
@@ -66,7 +66,7 @@
 
 check_PROGRAMS = chaman $(TESTS)
 
-LDADD = libiGeom.la
+LDADD = libiGeom.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la
 AM_LDFLAGS += $(CGM_EXT_LTFLAGS) $(CGM_EXT_LDFLAGS)
 testgeom_SOURCES = testgeom.cc
 testgeom_occ_SOURCES = $(testgeom_SOURCES)