[cgma-dev] r5886 - in cgm/trunk: . geom geom/Cholla geom/facet geom/facetbool geom/virtual itaps util

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-11-27 13:07:41 -0600 (Tue, 27 Nov 2012)
New Revision: 5886

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/configure.ac
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/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/util/Makefile.am
Log:
Changed Makefiles to make cgm on cubit build generated less libraries, to remove the confusion for the linker when doing 'make check' after 'make install'; Passed make check before and after install for cgm on cubit shared build and cgm on occ shared/static build.

Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2012-11-26 19:01:09 UTC (rev 5885)
+++ cgm/trunk/Makefile.am	2012-11-27 19:07:41 UTC (rev 5886)
@@ -43,16 +43,15 @@
 		  geom/Cholla/libCholla.la \
                   geom/facetbool/libcubit_facetbool.la \
                   geom/libcubit_geom.la \
-                  util/libcubit_util.la \
-                  amendment/libcgma_amendment.la
+                  util/libcubit_util.la 
 else
-  CORE_CGM_LIBS = geom/libcubit_geom.la  amendment/libcgma_amendment.la $(CGM_ll_LIB)
+  CORE_CGM_LIBS = $(CGM_ll_LIB)
 endif
 
 SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps
 # geom/testing
 
-libcgm_la_LIBADD = $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
+libcgm_la_LIBADD = init/libcgma_init.la amendment/libcgma_amendment.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 
 libcgm_la_SOURCES = 
 

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2012-11-26 19:01:09 UTC (rev 5885)
+++ cgm/trunk/configure.ac	2012-11-27 19:07:41 UTC (rev 5886)
@@ -22,6 +22,8 @@
 AC_C_BIGENDIAN( [], [AM_CPPFLAGS="$AM_CPPFLAGS -DLITTLE_ENDIAN=BYTE_ORDER"] )
 FATHOM_COMPILER_FLAGS
 
+FATHOM_CHECK_CXX_WORKS([], [AC_MSG_ERROR([Cannot build without C++ compiler])])
+
 ################################################################################
 #                Fortran Stuff for ITAPS C bindings
 ################################################################################

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2012-11-26 19:01:09 UTC (rev 5885)
+++ cgm/trunk/geom/Cholla/Makefile.am	2012-11-27 19:07:41 UTC (rev 5886)
@@ -1,12 +1,14 @@
 # Don't require GNU-standard files (Changelog, README, etc.)
 AUTOMAKE_OPTIONS = foreign
 
-# Override default defines with the ones we want from the configure script
 DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN)
-AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom 
+AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_srcdir)/geom