[MOAB-dev] r4083 - in MOAB/trunk: . examples itaps/igeom itaps/imesh src test

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-08-11 17:19:33 -0500 (Wed, 11 Aug 2010)
New Revision: 4083

Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/configure.ac
   MOAB/trunk/examples/Makefile.am
   MOAB/trunk/itaps/igeom/Makefile.am
   MOAB/trunk/itaps/imesh/Makefile.am
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/test/Makefile.am
Log:
Enable new features in automake 1.11:

  silent-rules : If user configures with --enable-silent-rules or
       builds with 'make V=0", then brief output (e.g. "CXX ReadHDF5.lo")
       will be printed rather the echoing the entire command (and for
       actual build commands, the corresponding real command generated
       by libtool.)  This feature is experimental and may be non-portbable,
       but that shouldn't be a problem because it is disabled by 
       default.  Warnings are still printed.
  
  color-tests : use color output for test status if supported by temrinal
  
  parallel-tests : 'make check' will run tests in parallel (number of jobs
       indicated by the make '-j' flag), and test output (and stderr)
       will be redirected to ${testname}.log.  
       
I assume that this will not break builds with older versions of automake.
There are no significant changes to anything other than the options list
to AM_INIT_AUTOMAKE, and automake should ignore unrecognized options.



Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2010-08-11 19:44:12 UTC (rev 4082)
+++ MOAB/trunk/Makefile.am	2010-08-11 22:19:33 UTC (rev 4083)
@@ -41,8 +41,8 @@
 # 'make prefix=/foo install', we don't know the correct install
 # directory until we're doing the install.
 install-data-hook:
-	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/moab.make
-	echo "MOAB_INCLUDES=-I${includedir}" >> $(DESTDIR)$(cfgdir)/moab.make
+	$(AM_V_at)echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/moab.make
+	$(AM_V_at)echo "MOAB_INCLUDES=-I${includedir}" >> $(DESTDIR)$(cfgdir)/moab.make
 
 
 # Generate a file to be installed in $libdir containing the configuration
@@ -53,7 +53,7 @@
 # Second line: extract just the list of options
 # Third line: put individual options on separate lines
 moab.config: config.status Makefile.am
-	./config.status --version | \
+	$(AM_V_GEN)./config.status --version | \
 	  sed -e 's/.*options "\(.*\)"/\1/p' -e 'd' | \
 	  sed -e "s/'[[:space:]]'/'\n'/g" >$@
 

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-08-11 19:44:12 UTC (rev 4082)
+++ MOAB/trunk/configure.ac	2010-08-11 22:19:33 UTC (rev 4083)
@@ -6,7 +6,7 @@
 AC_CONFIG_MACRO_DIR([config])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules color-tests parallel-tests])
 
 AC_CHECK_PROG( [SED], [sed], [sed], [true] )
 

Modified: MOAB/trunk/examples/Makefile.am
===================================================================
--- MOAB/trunk/examples/Makefile.am	2010-08-11 19:44:12 UTC (rev 4082)
+++ MOAB/trunk/examples/Makefile.am	2010-08-11 22:19:33 UTC (rev 4083)
@@ -43,15 +43,15 @@
 
 ex_make = $(DESTDIR)$(exampledir)/makefile
 install-data-hook:
-	rm -f $(ex_make)
-	mv $(DESTDIR)$(exampledir)/examples.make $(ex_make)
-	echo "all: $(check_PROGRAMS)" >>$(ex_make)
-	rule='	$$(CXX) -o $$@ $$< $$(CXXFLAGS) $$(MOAB_INCLUDES) $$(MOAB_LIBS_LINK)'; \