[MOAB-dev] r2875 - in MOAB/trunk: . m4 test/dual test/h5file test/obb test/perf tools tools/dagmc tools/iMesh tools/mbchaco tools/mbcoupler tools/mbperf tools/mbzoltan tools/mcnpmit tools/qvdual

kraftche at cae.wisc.edu kraftche at cae.wisc.edu
Mon May 4 16:02:13 CDT 2009 

Author: kraftche
Date: 2009-05-04 16:02:13 -0500 (Mon, 04 May 2009)
New Revision: 2875

Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/configure.ac
   MOAB/trunk/m4/makevar.m4
   MOAB/trunk/moab.make.in
   MOAB/trunk/test/dual/Makefile.am
   MOAB/trunk/test/h5file/Makefile.am
   MOAB/trunk/test/obb/Makefile.am
   MOAB/trunk/test/perf/Makefile.am
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/dagmc/Makefile.am
   MOAB/trunk/tools/iMesh/Makefile.am
   MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
   MOAB/trunk/tools/mbchaco/Makefile.am
   MOAB/trunk/tools/mbcoupler/Makefile.am
   MOAB/trunk/tools/mbperf/Makefile.am
   MOAB/trunk/tools/mbzoltan/Makefile.am
   MOAB/trunk/tools/mcnpmit/Makefile.am
   MOAB/trunk/tools/qvdual/Makefile.am
Log:
Fix mess with CGM LTFLAGS, exporting LDFLAGS/LTFLAGS in moab.make, etc.:

o Read in values of cgm.make during configure rather than including the
  actual cgm.make in every Makefile.am.

o Remove CGM-specific gunk from every tool and test's Makefile.am

o Move old contents of AM_LDFLAGS into EXPORT_LDFLAGS

o Add new EXPORT_LTFLAGS = $CGM_LTFLAGS

o Define AM_LDFLAGS = $EXPORT_LDFLAGS $EXPORT_LTFLAGS

There is no AM_LTFLAGS, so for internal use (building stuff within the
MOAB source tree using libtool) we need to put any libtool-specific flags
into AM_LDFLAGS.  However, we don't want to export that in variables such
as MOAB_LDFLAGS defined in moab.make, so we need EXPORT_LDFLAGS.



Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -2,8 +2,6 @@
 AUTOMAKE_OPTIONS = foreign
 LDADD = $(top_builddir)/libMOAB.la
 
- at CGM_CONFIG_OPTIONS@
-
 # Don't loose the autoconf include path
 ACLOCAL_AMFLAGS = -I m4
 
@@ -82,11 +80,9 @@
 endif
 
 if HAVE_CGM
-  INCLUDES += $(CGM_INCLUDES)
-  CPPFLAGS += $(CGM_CPPFLAGS) -DCGM $(MOAB_CGM_DEFINES)
+  CPPFLAGS += @CGM_CPPFLAGS@ -DCGM @MOAB_CGM_DEFINES@
   MOAB_EXTRA_SRCS +=  ReadCGM.cpp  ReadCGM.hpp
-  libMOAB_la_LIBADD += $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
-  LDADD += $(CGM_LTFLAGS) 
+  libMOAB_la_LIBADD += @CGM_LIBS@
 endif
 
 

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/configure.ac	2009-05-04 21:02:13 UTC (rev 2875)
@@ -169,7 +169,7 @@
 fi
 AM_CONDITIONAL(HDF5_FILE, [test "xno" != "x$HAVE_HDF5"])
 AM_CPPFLAGS="$HDF5_CPPFLAGS $AM_CPPFLAGS"
-AM_LDFLAGS="$HDF5_LDFLAGS $AM_LDFLAGS"
+EXPORT_LDFLAGS="$EXPORT_LDFLAGS $HDF5_LDFLAGS"
 AC_SUBST(HDF5_LIBS)
 
 HAVE_HDF5_PARALLEL=no
@@ -203,7 +203,7 @@
 fi
 AM_CONDITIONAL(NETCDF_FILE, [test "xno" != "x$HAVE_NETCDF"])
 AM_CPPFLAGS="$NETCDF_CPPFLAGS $AM_CPPFLAGS"
-AM_LDFLAGS="$NETCDF_LDFLAGS $AM_LDFLAGS"
+EXPORT_LDFLAGS="$NETCDF_LDFLAGS $EXPORT_LDFLAGS"
 AC_SUBST(NETCDF_LIBS)
 
 
@@ -827,15 +827,18 @@
     CGM_CONFIG_OPTIONS="include $CGM_MAKE"
     
     AC_MSG_CHECKING([Checking for GeometryQueryTool::ray_fire(RefFace*,...)])
+    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_DEFINES], [CGM_CPPFLAGS="$make_val"])   
+    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_INCLUDES],[CGM_CPPFLAGS="$CGM_CPPFLAGS $make_val"])   
+    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LTFLAGS],  [CGM_LTFLAGS="$make_val"])   
+    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LDFLAGS],  [CGM_LDFLAGS="$make_val"])   
+    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LIBS],     [CGM_LIBS="$make_val"])   
+    AC_LANG_PUSH([C++])
     old_CPPFLAGS="$CPPFLAGS"
     old_LDFLAGS="$LDFLAGS"
     old_LIBS="$LIBS"
-    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_DEFINES], [CPPFLAGS="$CPPFLAGS $make_val"])   
-    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_INCLUDES],[CPPFLAGS="$CPPFLAGS $make_val"])   
-    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LTFLAGS],  [LDFLAGS="$CPPFLAGS $make_val"])   
-    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LDFLAGS],  [LDFLAGS="$CPPFLAGS $make_val"])   
-    SNL_MAKE_INC_VAR([$CGM_MAKE],[CGM_LIBS],     [LIBS="$make_val $libs"])   
-    AC_LANG_PUSH([C++])
+    CPPFLAGS="$CGM_CPPFLAGS $CPPFLAGS"
+    LDFLAGS="$CGM_LTFLAGS $CGM_LDFLAGS $CPPFLAGS"
+    LIBS="$CGM_LIBS $LIBS"
     AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([#include "GeometryQueryTool.hpp"
                         #include "CubitVector.hpp"],
@@ -849,13 +852,15 @@
     LDFLAGS="$old_LDFLAGS"
     LIBS="$old_LIBS"
     AC_LANG_POP([C++])
+    EXPORT_LDFLAGS="$EXPORT_LDFLAGS $CGM_LDFLAGS"
+    EXPORT_LTFLAGS="$EXPORT_LTFLAGS $CGM_LTFLAGS"
   fi
 
   AC_SUBST(MOAB_CGM_DEFINES)
-  AC_SUBST(CGM_DIR)
-  AC_SUBST(CGM_CONFIG_OPTIONS)
-  DAGMC_CONFIG_OPTIONS="include \${MOAB_LIBDIR}/dagmc.make"
-  AC_SUBST(DAGMC_CONFIG_OPTIONS)
+  AC_SUBST(CGM_CPPFLAGS)
+  AC_SUBST(CGM_LDFLAGS)
+  AC_SUBST(CGM_LTFLAGS)
+  AC_SUBST(CGM_LIBS)
 
 fi
 AM_CONDITIONAL( HAVE_CGM, [test "x$CGM_MISSING" = "xno"] )
@@ -896,7 +901,10 @@
 AC_SUBST([INCLUDES])
 AC_SUBST([DEFINES])
 AC_SUBST([AM_CPPFLAGS])
+AM_LDFLAGS="$AM_LDFLAGS $EXPORT_LTFLAGS $EXPORT_LDFLAGS"
 AC_SUBST([AM_LDFLAGS])
+AC_SUBST([EXPORT_LTFLAGS])
+AC_SUBST([EXPORT_LDFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([DISTCHECK_CONFIGURE_FLAGS])

Modified: MOAB/trunk/m4/makevar.m4
===================================================================
--- MOAB/trunk/m4/makevar.m4	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/m4/makevar.m4	2009-05-04 21:02:13 UTC (rev 2875)
@@ -23,7 +23,7 @@
 include $1
 SNL_END_OF_MAKEFILE
 if make -f $snl_makefile > /dev/null 2>&1; then
-  make_val=`make -f $snl_makefile`
+  make_val=`make -s -f $snl_makefile`
   rm -f $snl_makefile
   $3
 else

Modified: MOAB/trunk/moab.make.in
===================================================================
--- MOAB/trunk/moab.make.in	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/moab.make.in	2009-05-04 21:02:13 UTC (rev 2875)
@@ -3,11 +3,8 @@
 
 MOAB_CXXFLAGS = @CXXFLAGS@ @AM_CXXFLAGS@
 MOAB_CFLAGS = @CFLAGS@ @AM_CFLAGS@
-MOAB_LDFLAGS = @LDFLAGS@ @AM_LDFLAGS@
+MOAB_LDFLAGS = @EXPORT_LDFLAGS@
 
 MOAB_INCLUDES = -I$(MOAB_INCLUDEDIR)
 
-MOAB_LIBS_LINK = ${MOAB_LDFLAGS} -L${MOAB_LIBDIR} -lMOAB @LIBS@ @HDF5_LIBS@ @NETCDF_LIBS@
-
-DAGMC_CONFIG_OPTIONS = @DAGMC_CONFIG_OPTIONS@
-
+MOAB_LIBS_LINK = ${MOAB_LDFLAGS} -L${MOAB_LIBDIR} -lMOAB @LIBS@ @HDF5_LIBS@ @NETCDF_LIBS@ @CGM_LIBS@

Modified: MOAB/trunk/test/dual/Makefile.am
===================================================================
--- MOAB/trunk/test/dual/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/test/dual/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,6 +1,4 @@
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir)
 check_PROGRAMS = dual_test
@@ -8,7 +6,3 @@
 LDADD = $(top_builddir)/libMOAB.la
 dual_test_DEPENDENCIES = $(top_builddir)/libMOAB.la
 TESTS = dual_test 
-
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif

Modified: MOAB/trunk/test/h5file/Makefile.am
===================================================================
--- MOAB/trunk/test/h5file/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/test/h5file/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,6 +1,4 @@
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/mhdf/include -I$(top_builddir)
 check_PROGRAMS = h5test h5legacy h5varlen h5sets_test h5regression h5partial
@@ -8,10 +6,6 @@
 TESTS = $(check_PROGRAMS)
 LDADD = $(top_builddir)/libMOAB.la
 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 h5test_SOURCES = h5file_test.cpp
 h5legacy_SOURCES = h5legacy.cpp
 h5varlen_SOURCES = h5varlen.cpp

Modified: MOAB/trunk/test/obb/Makefile.am
===================================================================
--- MOAB/trunk/test/obb/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/test/obb/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,16 +1,10 @@
 check_PROGRAMS = obb_test obb_time obb_tree_tool
 TESTS = obb_test
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir)
 LDADD = $(top_builddir)/libMOAB.la
 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 obb_test_SOURCES = obb_test.cpp
 obb_time_SOURCES = obb_time.cpp
 obb_tree_tool_SOURCES = obb_tree_tool.cpp

Modified: MOAB/trunk/test/perf/Makefile.am
===================================================================
--- MOAB/trunk/test/perf/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/test/perf/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,6 +1,4 @@
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) \
             -I$(top_srcdir)/mhdf/include \
@@ -10,10 +8,6 @@
             
 LDADD = $(top_builddir)/libMOAB.la
 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 check_PROGRAMS = perf seqperf adj_time
 noinst_PROGRAMS = point_in_elem
 

Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -6,12 +6,6 @@
 # For old (pre 1.10.x) versions of Automake
 docdir = @docdir@
 
- at CGM_CONFIG_OPTIONS@
-
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 bin_PROGRAMS =
 dist_man1_MANS = 
 doc_DATA = 

Modified: MOAB/trunk/tools/dagmc/Makefile.am
===================================================================
--- MOAB/trunk/tools/dagmc/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/dagmc/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) 
 
@@ -20,12 +18,16 @@
 noinst_PROGRAMS = cub2h5m
 bin_PROGRAMS = cgm2moab
 cgm2moab_SOURCES = main.cc cubfile.c
-cgm2moab_LDFLAGS = $(CGM_LTFLAGS)
-cgm2moab_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS_LINK)
+cgm2moab_LDFLAGS = $(CGM_LTFLAGS) $(CGM_LDLFAGS)
+cgm2moab_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LIBS)
 cgm2moab_DEPENDENCIES = libdagmc.la $(top_builddir)/libMOAB.la
 dist_man1_MANS = cgm2moab.man
 endif
                    
+CGM_CPPFLAGS = @CGM_CPPFLAGS@
+CGM_LDFLAGS = @CGM_LDFLAGS@
+CGM_LTFLAGS = @CGM_LTFLAGS@
+CGM_LIBS = @CGM_LIBS@
 
 # Automake doesn't seem to have a directory defined for
 # platform-dependent data (or include) files. So put 
@@ -38,13 +40,13 @@
 check_PROGRAMS = $(TESTS) pt_vol_test ray_fire_test
 test_geom_SOURCES = test_geom.cc
 cub2h5m_SOURCES = cub2h5m.cc
-test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LIBS_LINK)
-cub2h5m_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LIBS_LINK)
+test_geom_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LDFLAGS) $(CGM_LIBS)
+cub2h5m_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS) $(CGM_LDFLAGS) $(CGM_LIBS)
 
 pt_vol_test_SOURCES = pt_vol_test.cc
-pt_vol_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LIBS_LINK)
+pt_vol_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LDFLAGS) $(CGM_LIBS)
 
 ray_fire_test_SOURCES = ray_fire_test.cc
-ray_fire_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LIBS_LINK)
+ray_fire_test_LDADD = libdagmc.la $(top_builddir)/libMOAB.la $(CGM_LTFLAGS)  $(CGM_LDFLAGS) $(CGM_LIBS)
 
 

Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,8 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 BUILT_SOURCES = iMesh_protos.h iMeshP_protos.h iMesh_extensions_protos.h
 
- at CGM_CONFIG_OPTIONS@
-
 if USE_BABEL
   babel_DIR = SIDL
 else
@@ -47,10 +45,6 @@
 LDADD = libiMesh.la $(top_builddir)/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}
 TESTDEPS = libiMesh.la $(top_builddir)/libMOAB.la
 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 testc_cbind_SOURCES = testc_cbind.c
 testc_cbind_DEPENDENCIES = $(TESTDEPS)
 partest_SOURCES = partest.cpp

Modified: MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/iMesh/iMesh-Defs.inc.in	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,6 +1,6 @@
 IMESH_CXXFLAGS = @CXXFLAGS@ 
 IMESH_CFLAGS = @CFLAGS@
-IMESH_LDFLAGS = @LDFLAGS@ @AM_LDFLAGS@
+IMESH_LDFLAGS = @EXPORT_LDFLAGS@
 IMESH_CXX_LDFLAGS = @MOAB_CXX_LINKFLAGS@
 IMESH_CXX_LIBS = @MOAB_CXX_LIBS@
 
@@ -14,7 +14,8 @@
 IMESH_LIBS = $(IMESH_LDFLAGS) -L$(MOAB_LIBDIR) \
              -L${IMESH_LIBDIR} -liMesh -lMOAB \
              @NETCDF_LIBS@ @HDF5_LIBS@ @LIBS@ \
-             $(IMESH_CXX_LDFLAGS) $(IMESH_CXX_LIBS)
+             $(IMESH_CXX_LDFLAGS) $(IMESH_CXX_LIBS) \
+             @CGM_LDFLAGS@ @CGM_LIBS@
 
 IMESH_INCLUDEDIR = @abs_srcdir@
 IMESH_LIBDIR = @abs_builddir@/.libs

Modified: MOAB/trunk/tools/mbchaco/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbchaco/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/mbchaco/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,15 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(CHACO_INCLUDES)
 bin_PROGRAMS = mbchaco
 mbchaco_SOURCES = ComputePartition.hpp ComputePartition.cpp main.cpp
 LDADD = $(top_builddir)/libMOAB.la $(CHACO_LIBS)
 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
-
 mbchaco_DEPENDENCIES = $(top_builddir)/libMOAB.la

Modified: MOAB/trunk/tools/mbcoupler/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbcoupler/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/mbcoupler/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/parallel
 
@@ -9,9 +7,6 @@
 libmbcoupler_la_LIBADD = $(top_builddir)/libMOAB.la
 
 LDADD = libmbcoupler.la 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
 
 libmbcoupler_la_SOURCES = \
    MBElemUtil.cpp \

Modified: MOAB/trunk/tools/mbperf/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbperf/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/mbperf/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,12 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 DEFS = $(DEFINES) -DIS_BUILDING_MB
 
- at CGM_CONFIG_OPTIONS@
-
 LDADD = $(top_builddir)/libMOAB.la
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
 
 if USE_BABEL
   babel_includes = -I$(BABEL_DIR)/include

Modified: MOAB/trunk/tools/mbzoltan/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbzoltan/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/mbzoltan/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,14 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 DEFS = $(DEFINES) -DIS_BUILDING_MB
 
- at CGM_CONFIG_OPTIONS@
-
 LDADD = $(top_builddir)/libMOAB.la $(ZOLTAN_LIB_FLAGS) $(ZOLTAN_LIBS)
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
 
-
 INCLUDES += -I$(top_srcdir) \
             -I$(top_srcdir)/parallel \
             -I$(top_builddir) \

Modified: MOAB/trunk/tools/mcnpmit/Makefile.am
===================================================================
--- MOAB/trunk/tools/mcnpmit/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/mcnpmit/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,11 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 DEFS = $(DEFINES)
 
- at CGM_CONFIG_OPTIONS@
 LDADD = $(top_builddir)/libMOAB.la $(top_builddir)/tools/mbcoupler/libmbcoupler.la
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
 
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tools/mbcoupler
 bin_PROGRAMS = mcnpmit

Modified: MOAB/trunk/tools/qvdual/Makefile.am
===================================================================
--- MOAB/trunk/tools/qvdual/Makefile.am	2009-05-04 17:14:29 UTC (rev 2874)
+++ MOAB/trunk/tools/qvdual/Makefile.am	2009-05-04 21:02:13 UTC (rev 2875)
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
- at CGM_CONFIG_OPTIONS@
-
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(QVDUAL_INCLUDES)
 bin_PROGRAMS = qvdual
@@ -32,9 +30,6 @@
 
 
 LDADD = $(extra_depends) $(QVDUAL_LIBS) $(top_builddir)/libMOAB.la 
-if HAVE_CGM
-  LDADD += $(CGM_LTFLAGS) 
-endif
 AM_LDFLAGS = -R $(VTK_LIB_DIR)
 qvdual_DEPENDENCIES = $(extra_depends) $(top_builddir)/libMOAB.la

More information about the moab-dev mailing list