Author: janehu Date: 2012-11-16 11:19:12 -0600 (Fri, 16 Nov 2012) New Revision: 5871 Modified: cgm/trunk/Makefile.am cgm/trunk/cgm.make.in cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am cgm/trunk/configure.ac cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/init/InitCGMA.cpp cgm/trunk/itaps/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: 1. Added back the 3 testcases in test directory for cgm on cubit build, they passed the test. 2. trunk is working for all 3 builds of shared or static of cgm on occ and shared build for cgm on cubit. 3. Passed all make check under trunk. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2012-11-16 16:50:22 UTC (rev 5870) +++ cgm/trunk/Makefile.am 2012-11-16 17:19:12 UTC (rev 5871) @@ -43,15 +43,16 @@ geom/Cholla/libCholla.la \ geom/facetbool/libcubit_facetbool.la \ geom/libcubit_geom.la \ - util/libcubit_util.la + util/libcubit_util.la \ + amendment/libcgma_amendment.la else - CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) + CORE_CGM_LIBS = geom/libcubit_geom.la amendment/libcgma_amendment.la $(CGM_ll_LIB) endif -SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps +SUBDIRS = compat amendment 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) +libcgm_la_LIBADD = $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) libcgm_la_SOURCES = Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2012-11-16 16:50:22 UTC (rev 5870) +++ cgm/trunk/cgm.make.in 2012-11-16 17:19:12 UTC (rev 5871) @@ -22,6 +22,8 @@ -I@abs_top_builddir@/init \ -I@abs_top_srcdir@/geom \ -I@abs_top_builddir@/geom \ + -I@abs_top_srcdir@/amendment \ + -I@abs_top_builddir@/amendment \ -I@abs_top_srcdir@/geom/ACIS \ -I@abs_top_srcdir@/geom/virtual \ -I@abs_top_srcdir@/geom/facet \ Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2012-11-16 16:50:22 UTC (rev 5870) +++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2012-11-16 17:19:12 UTC (rev 5871) @@ -14,7 +14,7 @@ -I$(top_srcdir)/geom/facetbool if BUILD_CGM - LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/geom/Cholla/libCholla.la $(top_builddir)/geom/facet/libcubit_facet.la $(top_builddir)/geom/facetbool/libcubit_facetbool.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la + LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/geom/Cholla/libCholla.la $(top_builddir)/geom/facet/libcubit_facet.la $(top_builddir)/geom/facetbool/libcubit_facetbool.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la else