[cgma-dev] r5769 - in cgm/trunk: . test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-07 08:59:32 -0500 (Sun, 07 Oct 2012)
New Revision: 5769

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/configure.ac
   cgm/trunk/test/Makefile.am
Log:
complete moving the tests from geom/testing to test



Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2012-10-05 15:58:11 UTC (rev 5768)
+++ cgm/trunk/Makefile.am	2012-10-07 13:59:32 UTC (rev 5769)
@@ -48,7 +48,8 @@
   CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB)
 endif
 
-SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps geom/testing
+SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps 
+# geom/testing
 
 libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2012-10-05 15:58:11 UTC (rev 5768)
+++ cgm/trunk/configure.ac	2012-10-07 13:59:32 UTC (rev 5769)
@@ -621,8 +621,6 @@
            geom/facetbool/Makefile
            geom/OCC/Makefile
            geom/parallel/Makefile
-           geom/testing/Makefile
-           geom/testing/TestConfig.h
            geom/virtual/Makefile 
            init/Makefile
            compat/Makefile
@@ -633,6 +631,7 @@
 	   itaps/SIDL/common.make
            itaps/SIDL/iGeom-SIDL-Defs.inc
            test/Makefile
+           test/TestConfig.h
            cgm_apps/Makefile
            cgm_apps/examples/Makefile
            cgm_apps/examples/driverc++/Makefile

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2012-10-05 15:58:11 UTC (rev 5768)
+++ cgm/trunk/test/Makefile.am	2012-10-07 13:59:32 UTC (rev 5769)
@@ -27,7 +27,7 @@
 
 check_PROGRAMS = $(TESTS)
 
-LDADD = libcgm_test.la ../libcgm.la
+LDADD = ../libcgm.la libcgm_test.la $(CGM_EXT_LIBS)
 AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
 
 noinst_LTLIBRARIES = libcgm_test.la