Author: janehu Date: 2013-03-07 13:28:15 -0600 (Thu, 07 Mar 2013) New Revision: 6026 Added: cgm/trunk/geom/AutoMidsurfaceTool.cpp cgm/trunk/geom/AutoMidsurfaceTool.hpp cgm/trunk/geom/CAEntitySense.cpp cgm/trunk/geom/CAEntitySense.hpp cgm/trunk/geom/CAEntityTol.cpp cgm/trunk/geom/CAEntityTol.hpp cgm/trunk/geom/CGMHistory.cpp cgm/trunk/geom/CGMHistory.hpp cgm/trunk/geom/CubitCompat.cpp cgm/trunk/geom/CubitCompat.h.in cgm/trunk/geom/CubitCompat.hpp cgm/trunk/geom/GfxPreview.cpp cgm/trunk/geom/GfxPreview.hpp cgm/trunk/geom/LocalToleranceTool.cpp cgm/trunk/geom/LocalToleranceTool.hpp cgm/trunk/util/CubitFileSimModel.cpp cgm/trunk/util/CubitFileSimModel.hpp cgm/trunk/util/CubitUndo.cpp cgm/trunk/util/CubitUndo.hpp Modified: cgm/trunk/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/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/itaps/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: Changed to remove amendment directory, and put all files back to util or geom directory; Changed back to install only cgm and iGeom libraries. Passed occ, cubit and parallel make checks. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2013-03-06 20:57:17 UTC (rev 6025) +++ cgm/trunk/Makefile.am 2013-03-07 19:28:15 UTC (rev 6026) @@ -45,13 +45,13 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = $(CGM_ll_LIB) + CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) endif -SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps +SUBDIRS = compat util geom init . $(igeom_DIR) test cgm_apps # geom/testing -libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) +libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE) libcgm_la_SOURCES = Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2013-03-06 20:57:17 UTC (rev 6025) +++ cgm/trunk/configure.ac 2013-03-07 19:28:15 UTC (rev 6026) @@ -144,7 +144,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };], [AcisQueryEngine::instance_ = 0;])], - [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num -lcubit_geom -lcubit_util" + [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num" CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/\(.*\)"` CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE" AC_MSG_RESULT(yes) @@ -552,7 +552,7 @@ AC_MSG_RESULT([AM_CPPFLAGS = $AM_CPPFLAGS]) dnl AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi], dnl [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] ) -AC_CONFIG_HEADERS(config.h geom/parallel/CGMmpi_config.h amendment/CubitCompat.h) +AC_CONFIG_HEADERS(config.h geom/parallel/CGMmpi_config.h geom/CubitCompat.h) AC_CONFIG_HEADERS(itaps/iBase_FCDefs.h) AC_CONFIG_FILES(Makefile util/Makefile @@ -565,7 +565,6 @@ geom/parallel/Makefile geom/virtual/Makefile init/Makefile - amendment/Makefile compat/Makefile cgm.make