[cgma-dev] r5943 - cgm/branches/merge-cubit14.0

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-01-18 13:25:52 -0600 (Fri, 18 Jan 2013)
New Revision: 5943

Modified:
   cgm/branches/merge-cubit14.0/Makefile.am
   cgm/branches/merge-cubit14.0/configure.ac
Log:
Updated to reflect that cgm_apps and compat directories are not there for now. If they are needed, please let me know, I can check them in later.

Modified: cgm/branches/merge-cubit14.0/Makefile.am
===================================================================
--- cgm/branches/merge-cubit14.0/Makefile.am	2013-01-18 18:59:58 UTC (rev 5942)
+++ cgm/branches/merge-cubit14.0/Makefile.am	2013-01-18 19:25:52 UTC (rev 5943)
@@ -48,7 +48,7 @@
   CORE_CGM_LIBS = $(CGM_ll_LIB)
 endif
 
-SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps
+SUBDIRS =  amendment util geom init . $(igeom_DIR) test 
 # geom/testing
 
 libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)

Modified: cgm/branches/merge-cubit14.0/configure.ac
===================================================================
--- cgm/branches/merge-cubit14.0/configure.ac	2013-01-18 18:59:58 UTC (rev 5942)
+++ cgm/branches/merge-cubit14.0/configure.ac	2013-01-18 19:25:52 UTC (rev 5943)
@@ -564,7 +564,6 @@
            geom/virtual/Makefile 
            init/Makefile
            amendment/Makefile
-           compat/Makefile
            cgm.make
            itaps/Makefile
            itaps/iGeom-Defs.inc
@@ -573,10 +572,6 @@
            itaps/SIDL/iGeom-SIDL-Defs.inc
            test/Makefile
            test/TestConfig.h
-           cgm_apps/Makefile
-           cgm_apps/examples/Makefile
-           cgm_apps/examples/driverc++/Makefile
-           cgm_apps/examples/facetdriver/Makefile
 	   )
 # Generate iGeom_FCDefs.h from iBase_FCDefs.h
 AC_CONFIG_COMMANDS([itaps/iGeom_FCDefs.h],