[MOAB-dev] r2717 - in MOAB/trunk: . tools 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 Mar 16 12:38:54 CDT 2009 

Author: kraftche
Date: 2009-03-16 12:38:53 -0500 (Mon, 16 Mar 2009)
New Revision: 2717

Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/iMesh/Makefile.am
   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:
need to add $CGM_LTFLAGS for all tests and tools

Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,5 +1,6 @@
 # Don't require GNU-standard files (Changelog, README, etc.)
 AUTOMAKE_OPTIONS = foreign
+LDADD = $(top_builddir)/libMOAB.la
 
 @CGM_CONFIG_OPTIONS@
 
@@ -85,6 +86,7 @@
   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) 
 endif
 
 
@@ -267,110 +269,88 @@
 # Tests and such
 
 moab_test_SOURCES = MBTest.cpp
-moab_test_LDADD = $(top_builddir)/libMOAB.la
 moab_test_DEPENDENCIES = test/mb_big_test.g test/cell1.gen test/cell2.gen $(top_builddir)/libMOAB.la
 
 homxform_test_SOURCES = HomXform.cpp
-homxform_test_LDADD = $(top_builddir)/libMOAB.la
 homxform_test_CXXFLAGS = -DTEST $(CXXFLAGS)
 homxform_test_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 scdseq_test_SOURCES = scdseq_test.cpp
-scdseq_test_LDADD = $(top_builddir)/libMOAB.la
 scdseq_test_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 #scdseq_timing_SOURCES = scdseq_timing.cpp
-#scdseq_timing_LDADD = $(top_builddir)/libMOAB.la
 #scdseq_timing_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 tqdcfr_SOURCES = Tqdcfr.cpp
-tqdcfr_LDADD = $(top_builddir)/libMOAB.la
 tqdcfr_CXXFLAGS = -DTEST_TQDCFR $(CXXFLAGS)
 tqdcfr_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 #test_rms_SOURCES = test_rms.cpp
-#test_rms_LDADD = $(top_builddir)/libMOAB.la
 #test_rms_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 #merge_test_SOURCES = merge_test.cpp
-#merge_test_LDADD = $(top_builddir)/libMOAB.la
 #merge_test_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 #test_exo_SOURCES = test_exo.cpp
-#test_exo_LDADD = $(top_builddir)/libMOAB.la
 #test_exo_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 #test_tag_server_SOURCES = TagServer.cpp
-#test_tag_server_LDADD = $(top_builddir)/libMOAB.la
 #test_tag_server_CXXFLAGS = -DTEST $(CXXFLAGS)
 #test_tag_server_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 test_adj_SOURCES = test_adj.cpp
-test_adj_LDADD = $(top_builddir)/libMOAB.la
 test_adj_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 seq_man_test_SOURCES = TestUtil.hpp TestTypeSequenceManager.cpp 
-seq_man_test_LDADD = $(top_builddir)/libMOAB.la
 
 mesh_set_test_SOURCES = Test_MBMeshSet.cpp TestUtil.hpp
-mesh_set_test_LDADD = $(top_builddir)/libMOAB.la
 
 geom_util_test_SOURCES = TestUtil.hpp GeomUtilTests.cpp 
-geom_util_test_LDADD = $(top_builddir)/libMOAB.la
 geom_util_test_DEPENDENCIES = $(geom_util_test_LDADD)
 
 xform_test_SOURCES = MBAffineXform.cpp
 xform_test_CXXFLAGS = -DTEST $(CXXFLAGS)
-xform_test_LDADD = $(top_builddir)/libMOAB.la
 xform_test_DEPENDENCIES = $(xform_test_LDADD)
 
 obb_test_SOURCES = OBBTest.cpp
-obb_test_LDADD = $(top_builddir)/libMOAB.la
 obb_test_DEPENDENCIES = $(obb_test_LDADD)
 
 vtk_test_SOURCES = TestUtil.hpp VtkTest.cpp
-vtk_test_LDADD = $(top_builddir)/libMOAB.la
 vtk_test_DEPENDENCIES = $(vtk_test_LDADD)
 
 adaptive_kd_tree_tests_SOURCES = adaptive_kd_tree_tests.cpp
-adaptive_kd_tree_tests_LDADD = $(top_builddir)/libMOAB.la
 adaptive_kd_tree_tests_DEPENDENCIES = $(adaptive_kd_tree_tests_LDADD)
 
 kd_tree_tool_SOURCES = kd_tree_tool.cpp
-kd_tree_tool_LDADD = $(top_builddir)/libMOAB.la
 kd_tree_tool_DEPENDENCIES = $(kd_tree_tool_LDADD)
 
 kd_tree_time_SOURCES = kd_tree_time.cpp
-kd_tree_time_LDADD = $(top_builddir)/libMOAB.la
 kd_tree_time_DEPENDENCIES = $(kd_tree_time_LDADD)
 
 kd_tree_test_SOURCES = kd_tree_test.cpp
-kd_tree_test_LDADD = $(top_builddir)/libMOAB.la
 
 bsp_tree_test_SOURCES = bsp_tree_test.cpp
-bsp_tree_test_LDADD = $(top_builddir)/libMOAB.la
 
 file_options_test_SOURCES = TestUtil.hpp FileOptions.cpp 
 file_options_test_CPPFLAGS = -DTEST
+file_optionstest_LDADD = 
 
 var_len_test_SOURCES = TestUtil.hpp VarLenTagTest.cpp
 var_len_test_no_template_SOURCES = $(var_len_test_SOURCES)
 var_len_test_no_template_CPPFLAGS = -UTEMPLATE_SPECIALIZATION
 
 tag_test_SOURCES = TestUtil.hpp TagTest.cpp
-tag_test_LDADD = $(top_builddir)/libMOAB.la
 tag_test_DEPENDENCIES = $(tag_test_LDADD)
 
 cub_file_test_SOURCES = TestUtil.hpp cub_file_test.cc
-cub_file_test_LDADD = $(top_builddir)/libMOAB.la
 cub_file_test_DEPENDENCIES = $(tag_test_LDADD)
 
 exodus_test_SOURCES = TestUtil.hpp exodus_test.cc
-exodus_test_LDADD = $(top_builddir)/libMOAB.la
 exodus_test_DEPENDENCIES = $(tag_test_LDADD)
 
 mbcn_test_SOURCES = MBCN.hpp MBCN.cpp mbcn_test.cc
 mbcn_test_CPPFLAGS = -DSRCDIR=$(srcdir)  # define anything to work around build issue
+mbcn_test_LDADD = 
 
 # Other files to clean up (e.g. output from tests)
 MOSTLYCLEANFILES = dumped_acis.sat tree.h5m

Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -3,6 +3,12 @@
 INCLUDES += -I$(top_srcdir) -I$(top_builddir)
 LDADD = $(top_builddir)/libMOAB.la
 
+ at CGM_CONFIG_OPTIONS@
+
+if HAVE_CGM
+  LDADD += $(CGM_LTFLAGS) 
+endif
+
 bin_PROGRAMS =
 dist_man1_MANS = 
 doc_DATA = 

Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,6 +1,8 @@
 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
@@ -45,6 +47,10 @@
 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/mbchaco/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbchaco/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/mbchaco/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,7 +1,15 @@
 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-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/mbcoupler/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -6,7 +6,13 @@
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/parallel
 
 lib_LTLIBRARIES = libmbcoupler.la
+libmbcoupler_la_LIBADD = $(top_builddir)/libMOAB.la
 
+LDADD = libmbcoupler.la 
+if HAVE_CGM
+  LDADD += $(CGM_LTFLAGS) 
+endif
+
 libmbcoupler_la_SOURCES = \
    MBElemUtil.cpp \
    poly.c   \
@@ -37,9 +43,7 @@
 TESTS = findpt_test elem_util_test
 check_PROGRAMS = $(TESTS)
 findpt_test_SOURCES = findpt_test.cpp
-findpt_test_LDADD = libmbcoupler.la $(top_builddir)/libMOAB.la
 elem_util_test_SOURCES = ElemUtilTest.cpp
-elem_util_test_LDADD = libmbcoupler.la $(top_builddir)/libMOAB.la
 
 bin_PROGRAMS = 
 if PARALLEL
@@ -47,7 +51,6 @@
 #  check_PROGRAMS += mbcoupler_test
   bin_PROGRAMS += mbcoupler_test
   mbcoupler_test_SOURCES = mbcoupler_test.cpp
-  mbcoupler_test_LDADD = libmbcoupler.la $(top_builddir)/libMOAB.la
   INCLUDES += -I$(srcdir)/parallel
 endif
 

Modified: MOAB/trunk/tools/mbperf/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbperf/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/mbperf/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,6 +1,13 @@
 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
   babel_progs = mbperf_SIDL
@@ -30,7 +37,6 @@
 mbperf_SIDL_SOURCES = mbperf_SIDL.cpp
 mbperf_iMesh_SOURCES = mbperf_iMesh.cpp
 
-LDADD = $(top_builddir)/libMOAB.la
 mbperf_iMesh_LDADD = $(LDADD) ../iMesh/libiMesh.la 
 mbperf_SIDL_LDADD = $(mbperf_iMesh_LDADD) ../iMesh/SIDL/mserver/libiMeshserver.la
 

Modified: MOAB/trunk/tools/mbzoltan/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbzoltan/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/mbzoltan/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,12 +1,20 @@
 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) \
             $(ZOLTAN_INC_FLAGS)
 bin_PROGRAMS = mbzoltan
 mbzoltan_SOURCES = MBZoltan.cpp MBZoltan.hpp main.cpp
-mbzoltan_LDADD = $(top_builddir)/libMOAB.la $(ZOLTAN_LIB_FLAGS) $(ZOLTAN_LIBS)
 mbzoltan_DEPENDENCIES = $(top_builddir)/libMOAB.la
 
 

Modified: MOAB/trunk/tools/mcnpmit/Makefile.am
===================================================================
--- MOAB/trunk/tools/mcnpmit/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/mcnpmit/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,7 +1,13 @@
 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
 mcnpmit_SOURCES = mcnpmit.hpp mcnpmit.cpp main.cpp
-LDADD = $(top_builddir)/libMOAB.la $(top_builddir)/tools/mbcoupler/libmbcoupler.la
 mcnpmit_DEPENDENCIES = $(top_builddir)/libMOAB.la $(top_builddir)/tools/mbcoupler/libmbcoupler.la

Modified: MOAB/trunk/tools/qvdual/Makefile.am
===================================================================
--- MOAB/trunk/tools/qvdual/Makefile.am	2009-03-13 18:48:13 UTC (rev 2716)
+++ MOAB/trunk/tools/qvdual/Makefile.am	2009-03-16 17:38:53 UTC (rev 2717)
@@ -1,4 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
+
+ at CGM_CONFIG_OPTIONS@
+
 DEFS = $(DEFINES)
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(QVDUAL_INCLUDES)
 bin_PROGRAMS = qvdual
@@ -29,6 +32,9 @@
 
 
 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