[MOAB-dev] r4311 - in MOAB/trunk/tools: . dagmc

[sjackson at cae.wisc.edu]

Author: sjackson
Date: 2010-12-01 12:56:28 -0600 (Wed, 01 Dec 2010)
New Revision: 4311

Modified:
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/dagmc/Makefile.am
Log:
Make program_opts a (non-installed) library, so that it may be
reused by other tools without being recompiled.

Note I had to add `.' to the SUBDIRS of tools/Makefile.am, thus
altering the build order of the subdirectories of tools/.

Modified: MOAB/trunk/tools/Makefile.am
===================================================================
--- MOAB/trunk/tools/Makefile.am	2010-12-01 17:49:23 UTC (rev 4310)
+++ MOAB/trunk/tools/Makefile.am	2010-12-01 18:56:28 UTC (rev 4311)
@@ -115,7 +115,11 @@
 
 noinst_PROGRAMS = $(parread)
 
-SUBDIRS = $(refiner_DIR) \
+noinst_LTLIBRARIES = libprogram_opt.la
+libprogram_opt_la_SOURCES = program_opt.cpp program_opt.hpp
+
+SUBDIRS = . \
+          $(refiner_DIR) \
           $(mbcoupler_DIR) \
           $(mbzoltan_DIR) \
 	  $(mcnpmit_DIR) \
@@ -133,4 +137,3 @@
 mbtagprop_SOURCES = parse.cpp parse.hpp propagate_tags.cpp
 mbmem_SOURCES = mbmem.cpp
 parread_SOURCES = parread.cpp
-

Modified: MOAB/trunk/tools/dagmc/Makefile.am
===================================================================
--- MOAB/trunk/tools/dagmc/Makefile.am	2010-12-01 17:49:23 UTC (rev 4310)
+++ MOAB/trunk/tools/dagmc/Makefile.am	2010-12-01 18:56:28 UTC (rev 4311)
@@ -41,4 +41,5 @@
 
 ray_fire_test_SOURCES = ray_fire_test.cc
 
-dagmc_preproc_SOURCES = dagmc_preproc.cpp ../program_opt.cpp ../program_opt.hpp
+dagmc_preproc_SOURCES = dagmc_preproc.cpp 
+dagmc_preproc_LDADD = $(LDADD) $(top_builddir)/tools/libprogram_opt.la