[cgma-dev] r4111 - in cgm/trunk: . cgm_apps cgm_apps/examples cgm_apps/examples/driverc++ cgm_apps/examples/facetdriver geom geom/ACIS_SRC geom/Cholla geom/OCC geom/facet geom/facetbool geom/parallel geom/virtual init itaps test util

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-08-30 17:53:52 -0500 (Mon, 30 Aug 2010)
New Revision: 4111

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/cgm_apps/Makefile.am
   cgm/trunk/cgm_apps/examples/Makefile.am
   cgm/trunk/cgm_apps/examples/driverc++/Makefile.am
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/configure.ac
   cgm/trunk/geom/ACIS_SRC/Makefile.am
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/geom/Makefile.am
   cgm/trunk/geom/OCC/Makefile.am
   cgm/trunk/geom/facet/Makefile.am
   cgm/trunk/geom/facetbool/Makefile.am
   cgm/trunk/geom/parallel/Makefile.am
   cgm/trunk/geom/virtual/Makefile.am
   cgm/trunk/init/Makefile.am
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/test/Makefile.am
   cgm/trunk/util/Makefile.am
Log:
Misc. fixes and improvements to autotools build:

o Enable "silent-rules color-tests parallel-tests" options if using
  sufficiently new version of automake
o Specify -Wall the correct way so that it is enabled for all compilers
  for which automake knows the correct flag rather than just for g++
o Move some logic duplicated (in some cases incorrectly) in every 
  Makefile.am into configure.ac (-DTEMPLATE_DEFS_INCLUDED and other 
  configured preprocessor macros.)
o Replace use of old, deprecated INCLUDES and DEFS variables with
  AM_CPPFLAGS
o Clean up unnecessary per-test CPPFLAGS, LDFLAGS, etc.
o Remove unnecessary AUTOMAKE_OPTIONS variable from all but top-level
  Makefile.am
o Make a few odd makefile rules play nice with 'silent-rules' option.


Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2010-08-30 21:32:51 UTC (rev 4110)
+++ cgm/trunk/Makefile.am	2010-08-30 22:53:52 UTC (rev 4111)
@@ -56,6 +56,6 @@
 # directory until we're doing the install.
 CFG_FILE = $(DESTDIR)$(cfgdir)/cgm.make
 install-data-hook:
-	echo "CGM_INT_INCLUDE = -I$(includedir)"  >> $(CFG_FILE)
-	echo "CGM_INT_LDFLAGS = -L$(libdir)"      >> $(CFG_FILE)
-	echo "CGM_INT_LTFLAGS = -R$(libdir)"      >> $(CFG_FILE)
+	$(AM_V_at)echo "CGM_INT_INCLUDE = -I$(includedir)"  >> $(CFG_FILE)
+	$(AM_V_at)echo "CGM_INT_LDFLAGS = -L$(libdir)"      >> $(CFG_FILE)
+	$(AM_V_at)echo "CGM_INT_LTFLAGS = -R$(libdir)"      >> $(CFG_FILE)

Modified: cgm/trunk/cgm_apps/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/Makefile.am	2010-08-30 21:32:51 UTC (rev 4110)
+++ cgm/trunk/cgm_apps/Makefile.am	2010-08-30 22:53:52 UTC (rev 4111)
@@ -1,2 +1 @@
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = examples

Modified: cgm/trunk/cgm_apps/examples/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/Makefile.am	2010-08-30 21:32:51 UTC (rev 4110)
+++ cgm/trunk/cgm_apps/examples/Makefile.am	2010-08-30 22:53:52 UTC (rev 4111)
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
 if build_ACIS
   ACIS_SUBDIRS = driverc++
 else

Modified: cgm/trunk/cgm_apps/examples/driverc++/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/driverc++/Makefile.am	2010-08-30 21:32:51 UTC (rev 4110)
+++ cgm/trunk/cgm_apps/examples/driverc++/Makefile.am	2010-08-30 22:53:52 UTC (rev 4111)
@@ -1,6 +1,5 @@
 TESTS = mergechk_merge mergechk_huge
 EXTRA_DIST = README merge.sat huge.sat $(TESTS)
-DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN)
 
 check_PROGRAMS = mergechk
 CLEANFILES = mmgr.log

Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2010-08-30 21:32:51 UTC (rev 4110)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2010-08-30 22:53:52 UTC (rev 4111)
@@ -1,6 +1,3 @@