[svn-r11460] Purpose:

Documentation update

Description:
Updated config/Makefile.am.blank now that I know better.

1 files changed, 13 insertions, 12 deletions

diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank
index 64d8cb0..9773206 100755
--- a/config/Makefile.am.blank
+++ b/config/Makefile.am.blank
@@ -20,11 +20,14 @@
 ## Makefile.am template
 ## When automake is run, it scans configure.in to find all Makefiles used by
 ## the build that come from Makefile.in files.  If there are Makefile.am's 
-## in any of those locations, it parses the Makefile.am's to produce Makefile.in's,
-## which configure uses to create Makefiles.
+## in any of those locations, it parses the Makefile.am's to produce
+## Makefile.in's, which configure uses to create Makefiles.
 ##
-## Comments in the Makefile.am with two pound signs will be stripped by automake,
-## comments with one pound sign will be passed through to the Makefile.in.
+## Comments in the Makefile.am with two pound signs will be stripped by
+## automake, comments with one pound sign will be passed through to the
+## Makefile.in (and thence into the Makefile).  Be warned, though, that
+## automake tends to move things around in the Makefile.in, lines in the
+## Makefile.in aren't always in the order they were in the Makefile.am.
 ##
 ## Almost all Makefile.am's in hdf5 include commence.am and conclude.am; these
 ## files are treated as if they were included textually in the Makefile.am when
@@ -35,7 +38,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Add include directories to the C preprocessor flags
-#AM_CFLAGS=-I$(top_srcdir)/src
+#INCLUDES=-I$(top_srcdir)/src
 
 # Our main targets, the library foo.la and the programs bar and baz
 #lib_LTLIBRARIES=foo.la
@@ -46,8 +49,8 @@ noinst_PROGRAMS=helper
 check_PROGRAMS=test1 test2
 check_SCRIPTS=runtest
 
-# Remove files generated by tests during 'make mostlyclean'
-MOSTLYCLEAN=test1.h5 test2.h5
+# Remove files generated by tests during 'make check-clean'
+CHECK_CLEANFILES=test1.h5 test2.h5
 
 # library sources
 foo_la_SOURCES= source1.c source2.c anothersource.c                   \
@@ -57,10 +60,8 @@ foo_la_SOURCES= source1.c source2.c anothersource.c                   \
 bar_SOURCES= bar.c barsource.c
 test2_SOURCES= asdf.c jkl.c
 
-# Link with the main HDF5 library when building foo.la
-foo_la_LIBADD=$(LIBHDF5)
-
-# Link with the main HDF5 library and foo.la when building other targets
-LDADD=$(LIBHDF5) foo.la
+# Link with the main HDF5 library and foo.la when building other targets.
+# It's important that libhdf5 comes last, since foo.la depends on it.
+LDADD=foo.la $(LIBHDF5)
 
 include $(top_srcdir)/config/conclude.am