build: Change dubious wildcard stuff to use +=

Also make sure that the list of files is updated on
"make dist".

4 files changed, 298 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index e2565ec..c624c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,28 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-nobase_pkginclude_HEADERS=raslib/*.h raslib/*.hh raslib/*.icc raslib/*.cc \
-		rasodmg/*.hh rasodmg/*.cc rasodmg/*.icc conversion/*.h conversion/*.hh \
-		compression/*.hh clientcomm/*.h clientcomm/*.hh
+nobase_pkginclude_HEADERS =
+include $(srcdir)/header-files.mk
+
+dist-hook:
+	(echo "# DO NOT MODIFY THIS FILE"; \
+	echo "# This file was autogenerated by the dist-hook target"; \
+	cd "$(srcdir)"; \
+	find raslib -type f \
+		\( -name '*.h' -or -name '*.hh' -or -name '*.icc' -or -name '*.cc' \) ; \
+	find rasodmg -type f \
+		\( -name '*.hh' -or -name '*.cc' -or -name '*.icc' \) ; \
+	find conversion -type f \( -name '*.h' -or -name '*.hh' \) ; \
+	find compression -type f -name '*.hh' ; \
+	find clientcomm -type f \( -name '*.h' -or -name '*.hh' \)  \
+	) | $(SED) 's,^\([^#]\),nobase_pkginclude_HEADERS += \1,' \
+	> header-files.mk.new
+	if test -f "$(srcdir)/header-files.mk" \
+	&& cmp "header-files.mk.new" "$(srcdir)/header-files.mk"; then \
+		rm -f "header-files.mk.new"; \
+	else \
+		mv -f "header-files.mk.new" "$(srcdir)/header-files.mk"; \
+	fi
 
 SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \
           indexmgr catalogmgr tilemgr storagemgr compression commline network \
diff --git a/header-files.mk b/header-files.mk
new file mode 100644
index 0000000..158109c
--- /dev/null
+++ b/header-files.mk
@@ -0,0 +1,231 @@
+# DO NOT MODIFY THIS FILE
+# This file was autogenerated by the dist-hook target
+nobase_pkginclude_HEADERS += raslib/sintervaltype.hh
+nobase_pkginclude_HEADERS += raslib/miterd.hh
+nobase_pkginclude_HEADERS += raslib/type.cc
+nobase_pkginclude_HEADERS += raslib/rmdebug.hh
+nobase_pkginclude_HEADERS += raslib/structuretype.hh
+nobase_pkginclude_HEADERS += raslib/mitera.cc
+nobase_pkginclude_HEADERS += raslib/scalar.hh
+nobase_pkginclude_HEADERS += raslib/complex.hh
+nobase_pkginclude_HEADERS += raslib/miterd.cc
+nobase_pkginclude_HEADERS += raslib/pointtype.hh
+nobase_pkginclude_HEADERS += raslib/error.hh
+nobase_pkginclude_HEADERS += raslib/minterval.hh
+nobase_pkginclude_HEADERS += raslib/parseparams.hh
+nobase_pkginclude_HEADERS += raslib/metaobject.cc
+nobase_pkginclude_HEADERS += raslib/error.icc
+nobase_pkginclude_HEADERS += raslib/complex.cc
+nobase_pkginclude_HEADERS += raslib/collectiontype.cc
+nobase_pkginclude_HEADERS += raslib/itertype.hh
+nobase_pkginclude_HEADERS += raslib/basetype.cc
+nobase_pkginclude_HEADERS += raslib/miterf.icc
+nobase_pkginclude_HEADERS += raslib/mddtypes.cc
+nobase_pkginclude_HEADERS += raslib/mintervaltype.hh
+nobase_pkginclude_HEADERS += raslib/rm.hh
+nobase_pkginclude_HEADERS += raslib/point.hh
+nobase_pkginclude_HEADERS += raslib/sinterval.icc
+nobase_pkginclude_HEADERS += raslib/miter.cc
+nobase_pkginclude_HEADERS += raslib/sintervaltype.cc
+nobase_pkginclude_HEADERS += raslib/error.cc
+nobase_pkginclude_HEADERS += raslib/storageman.cc
+nobase_pkginclude_HEADERS += raslib/primitive.hh
+nobase_pkginclude_HEADERS += raslib/sinterval.cc
+nobase_pkginclude_HEADERS += raslib/oidtype.cc
+nobase_pkginclude_HEADERS += raslib/structure.cc
+nobase_pkginclude_HEADERS += raslib/rmdebug.cc
+nobase_pkginclude_HEADERS += raslib/marraytype.cc
+nobase_pkginclude_HEADERS += raslib/attribute.cc
+nobase_pkginclude_HEADERS += raslib/dlist.hh
+nobase_pkginclude_HEADERS += raslib/itertype.cc
+nobase_pkginclude_HEADERS += raslib/sinterval.hh
+nobase_pkginclude_HEADERS += raslib/miterf.hh
+nobase_pkginclude_HEADERS += raslib/rminit.cc
+nobase_pkginclude_HEADERS += raslib/rminit.hh
+nobase_pkginclude_HEADERS += raslib/complextype.icc
+nobase_pkginclude_HEADERS += raslib/oidtype.hh
+nobase_pkginclude_HEADERS += raslib/odmgtypes.hh
+nobase_pkginclude_HEADERS += raslib/primitive.cc
+nobase_pkginclude_HEADERS += raslib/complextype.hh
+nobase_pkginclude_HEADERS += raslib/storageman.hh
+nobase_pkginclude_HEADERS += raslib/flatbasetype.cc
+nobase_pkginclude_HEADERS += raslib/endian.cc
+nobase_pkginclude_HEADERS += raslib/mddtypes.hh
+nobase_pkginclude_HEADERS += raslib/mitera.hh
+nobase_pkginclude_HEADERS += raslib/template_inst.hh
+nobase_pkginclude_HEADERS += raslib/point.cc
+nobase_pkginclude_HEADERS += raslib/type.hh
+nobase_pkginclude_HEADERS += raslib/property.hh
+nobase_pkginclude_HEADERS += raslib/miterd.icc
+nobase_pkginclude_HEADERS += raslib/endian.hh
+nobase_pkginclude_HEADERS += raslib/collectiontype.hh
+nobase_pkginclude_HEADERS += raslib/minterval.cc
+nobase_pkginclude_HEADERS += raslib/mintervaltype.cc
+nobase_pkginclude_HEADERS += raslib/structuretype.cc
+nobase_pkginclude_HEADERS += raslib/oid.icc
+nobase_pkginclude_HEADERS += raslib/primitivetype.hh
+nobase_pkginclude_HEADERS += raslib/parseparams.cc
+nobase_pkginclude_HEADERS += raslib/memblockvec.hh
+nobase_pkginclude_HEADERS += raslib/scalar.cc
+nobase_pkginclude_HEADERS += raslib/property.cc
+nobase_pkginclude_HEADERS += raslib/dlist.cc
+nobase_pkginclude_HEADERS += raslib/attribute.hh
+nobase_pkginclude_HEADERS += raslib/rm.cc
+nobase_pkginclude_HEADERS += raslib/primitivetype.cc
+nobase_pkginclude_HEADERS += raslib/flatbasetype.hh
+nobase_pkginclude_HEADERS += raslib/pointtype.cc
+nobase_pkginclude_HEADERS += raslib/metaobject.hh
+nobase_pkginclude_HEADERS += raslib/marraytype.hh
+nobase_pkginclude_HEADERS += raslib/complex.icc
+nobase_pkginclude_HEADERS += raslib/minterval.icc
+nobase_pkginclude_HEADERS += raslib/complextype.cc
+nobase_pkginclude_HEADERS += raslib/memblockvec.cc
+nobase_pkginclude_HEADERS += raslib/rmdebug.icc
+nobase_pkginclude_HEADERS += raslib/test/test_oid.cc
+nobase_pkginclude_HEADERS += raslib/test/test_metaobject.cc
+nobase_pkginclude_HEADERS += raslib/test/test_params.cc
+nobase_pkginclude_HEADERS += raslib/test/test_endian.cc
+nobase_pkginclude_HEADERS += raslib/test/test_miter.cc
+nobase_pkginclude_HEADERS += raslib/test/test_point.cc
+nobase_pkginclude_HEADERS += raslib/test/test_miterd.cc
+nobase_pkginclude_HEADERS += raslib/test/test_rmdebug.cc
+nobase_pkginclude_HEADERS += raslib/test/test_miterf.cc
+nobase_pkginclude_HEADERS += raslib/test/test_timer.cc
+nobase_pkginclude_HEADERS += raslib/test/test_sinterval.cc
+nobase_pkginclude_HEADERS += raslib/test/test_minterval.cc
+nobase_pkginclude_HEADERS += raslib/test/test_error.cc
+nobase_pkginclude_HEADERS += raslib/miter.hh
+nobase_pkginclude_HEADERS += raslib/basetype.hh
+nobase_pkginclude_HEADERS += raslib/shhopt.h
+nobase_pkginclude_HEADERS += raslib/structure.hh
+nobase_pkginclude_HEADERS += raslib/oid.hh
+nobase_pkginclude_HEADERS += raslib/oid.cc
+nobase_pkginclude_HEADERS += raslib/point.icc
+nobase_pkginclude_HEADERS += raslib/miter.icc
+nobase_pkginclude_HEADERS += rasodmg/stattiling.hh
+nobase_pkginclude_HEADERS += rasodmg/transaction.icc
+nobase_pkginclude_HEADERS += rasodmg/iterator.icc
+nobase_pkginclude_HEADERS += rasodmg/dirdecompose.cc
+nobase_pkginclude_HEADERS += rasodmg/marray.icc
+nobase_pkginclude_HEADERS += rasodmg/database.cc
+nobase_pkginclude_HEADERS += rasodmg/interesttiling.cc
+nobase_pkginclude_HEADERS += rasodmg/tiling.cc
+nobase_pkginclude_HEADERS += rasodmg/set.hh
+nobase_pkginclude_HEADERS += rasodmg/ref.cc
+nobase_pkginclude_HEADERS += rasodmg/polycutout.cc
+nobase_pkginclude_HEADERS += rasodmg/object.hh
+nobase_pkginclude_HEADERS += rasodmg/collection.cc
+nobase_pkginclude_HEADERS += rasodmg/interesttiling.hh
+nobase_pkginclude_HEADERS += rasodmg/storagelayout.icc
+nobase_pkginclude_HEADERS += rasodmg/oqlquery.icc
+nobase_pkginclude_HEADERS += rasodmg/marray.cc
+nobase_pkginclude_HEADERS += rasodmg/partinsert.hh
+nobase_pkginclude_HEADERS += rasodmg/ref.hh
+nobase_pkginclude_HEADERS += rasodmg/transaction.hh
+nobase_pkginclude_HEADERS += rasodmg/gmarray.hh
+nobase_pkginclude_HEADERS += rasodmg/iterator.cc
+nobase_pkginclude_HEADERS += rasodmg/storagelayout.hh
+nobase_pkginclude_HEADERS += rasodmg/storagelayout.cc
+nobase_pkginclude_HEADERS += rasodmg/object.icc
+nobase_pkginclude_HEADERS += rasodmg/polycutout.hh
+nobase_pkginclude_HEADERS += rasodmg/alignedtiling.icc
+nobase_pkginclude_HEADERS += rasodmg/dirtiling.cc
+nobase_pkginclude_HEADERS += rasodmg/collection.hh
+nobase_pkginclude_HEADERS += rasodmg/gmarray.icc
+nobase_pkginclude_HEADERS += rasodmg/collection.icc
+nobase_pkginclude_HEADERS += rasodmg/set.cc
+nobase_pkginclude_HEADERS += rasodmg/iterator.hh
+nobase_pkginclude_HEADERS += rasodmg/marray.hh
+nobase_pkginclude_HEADERS += rasodmg/alignedtiling.cc
+nobase_pkginclude_HEADERS += rasodmg/transaction.cc
+nobase_pkginclude_HEADERS += rasodmg/tiling.hh
+nobase_pkginclude_HEADERS += rasodmg/object.cc
+nobase_pkginclude_HEADERS += rasodmg/stattiling.cc
+nobase_pkginclude_HEADERS += rasodmg/alignedtiling.hh
+nobase_pkginclude_HEADERS += rasodmg/oqlquery.cc
+nobase_pkginclude_HEADERS += rasodmg/oqlquery.hh
+nobase_pkginclude_HEADERS += rasodmg/dirtiling.hh
+nobase_pkginclude_HEADERS += rasodmg/ref.icc
+nobase_pkginclude_HEADERS += rasodmg/dirdecompose.hh
+nobase_pkginclude_HEADERS += rasodmg/database.hh
+nobase_pkginclude_HEADERS += rasodmg/gmarray.cc
+nobase_pkginclude_HEADERS += rasodmg/database.icc
+nobase_pkginclude_HEADERS += rasodmg/test/test_oqlquery.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_insert3.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_stat.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_storage.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_transaction.cc
+nobase_pkginclude_HEADERS += rasodmg/test/rasql.hh
+nobase_pkginclude_HEADERS += rasodmg/test/test_benchmark.cc
+nobase_pkginclude_HEADERS += rasodmg/test/defdiff.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_dir.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_update.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_stattiling.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_int.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_collection.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_basic.hh
+nobase_pkginclude_HEADERS += rasodmg/test/system_compare.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_pet.cc
+nobase_pkginclude_HEADERS += rasodmg/test/defconv.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_dirtiling.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_query.cc
+nobase_pkginclude_HEADERS += rasodmg/test/readln.cc
+nobase_pkginclude_HEADERS += rasodmg/test/rasql.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_query.hh
+nobase_pkginclude_HEADERS += rasodmg/test/defutil.hh
+nobase_pkginclude_HEADERS += rasodmg/test/test_fastscale.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_ref.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_insert.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_set.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_insert.hh
+nobase_pkginclude_HEADERS += rasodmg/test/deletecollection.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_gmarray.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_query.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_alignedtiling.cc
+nobase_pkginclude_HEADERS += rasodmg/test/system_update.hh
+nobase_pkginclude_HEADERS += rasodmg/test/test_interesttiling.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_polygon.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_int1.cc
+nobase_pkginclude_HEADERS += rasodmg/test/readln.hh
+nobase_pkginclude_HEADERS += rasodmg/test/system_compare.hh
+nobase_pkginclude_HEADERS += rasodmg/test/system_basic.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_lookup.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_marray.cc
+nobase_pkginclude_HEADERS += rasodmg/test/gen_pattern.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_iterator.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_insert.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_breakdown.cc
+nobase_pkginclude_HEADERS += rasodmg/test/test_bmark_dir1.cc
+nobase_pkginclude_HEADERS += rasodmg/polygon.hh
+nobase_pkginclude_HEADERS += rasodmg/polygon.cc
+nobase_pkginclude_HEADERS += rasodmg/partinsert.cc
+nobase_pkginclude_HEADERS += conversion/jpeg.hh
+nobase_pkginclude_HEADERS += conversion/nitf.h
+nobase_pkginclude_HEADERS += conversion/des.h
+nobase_pkginclude_HEADERS += conversion/tor.hh
+nobase_pkginclude_HEADERS += conversion/text.h
+nobase_pkginclude_HEADERS += conversion/dem.hh
+nobase_pkginclude_HEADERS += conversion/hdf.hh
+nobase_pkginclude_HEADERS += conversion/tiff.hh
+nobase_pkginclude_HEADERS += conversion/ecwmemfs.hh
+nobase_pkginclude_HEADERS += conversion/convfactory.hh
+nobase_pkginclude_HEADERS += conversion/graphic.h
+nobase_pkginclude_HEADERS += conversion/png.hh
+nobase_pkginclude_HEADERS += conversion/convertor.hh
+nobase_pkginclude_HEADERS += conversion/image.h
+nobase_pkginclude_HEADERS += conversion/int16.hh
+nobase_pkginclude_HEADERS += conversion/bmp.hh
+nobase_pkginclude_HEADERS += conversion/memfs.hh
+nobase_pkginclude_HEADERS += conversion/memfs.h
+nobase_pkginclude_HEADERS += conversion/csv.hh
+nobase_pkginclude_HEADERS += conversion/vff.hh
+nobase_pkginclude_HEADERS += conversion/res.h
+nobase_pkginclude_HEADERS += conversion/ecw.hh
+nobase_pkginclude_HEADERS += conversion/ntf.hh
+nobase_pkginclude_HEADERS += conversion/utilities.h
+nobase_pkginclude_HEADERS += compression/tilecompnone.hh
+nobase_pkginclude_HEADERS += compression/tilecompression.hh
+nobase_pkginclude_HEADERS += clientcomm/clnt_control/clnt_control.h
+nobase_pkginclude_HEADERS += clientcomm/clnt_control.h
+nobase_pkginclude_HEADERS += clientcomm/rpcclientcomm.hh
+nobase_pkginclude_HEADERS += clientcomm/clientcomm.hh
diff --git a/manuals_and_examples/Makefile.am b/manuals_and_examples/Makefile.am
index 9d50775..ee89bc1 100644
--- a/manuals_and_examples/Makefile.am
+++ b/manuals_and_examples/Makefile.am
@@ -21,9 +21,22 @@
 # or contact Peter Baumann via <baumann@rasdaman.com>. 
 ####################################################################
 
-nobase_dist_pkgdata_DATA=examples/images/* examples/c++/* \
-                         examples/java/* examples/queries/* \
-                         examples/rasdl/basictypes.dl
+nobase_dist_pkgdata_DATA =
+include $(srcdir)/example-files.mk
+
+dist-hook:
+	(echo "# DO NOT MODIFY THIS FILE"; \
+	echo "# This file was autogenerated by the dist-hook target"; \
+	cd $(srcdir) && \
+	find examples -type f -not -name '.*' \
+	) | $(SED) 's,^\([^#]\),nobase_dist_pkgdata_DATA += \1,' \
+	> example-files.mk.new
+	if test -f "$(srcdir)/example-files.mk" \
+	&& cmp "example-files.mk.new" "$(srcdir)/example-files.mk"; then \
+		rm -f "example-files.mk.new"; \
+	else \
+		mv -f "example-files.mk.new" "$(srcdir)/example-files.mk"; \
+	fi
 
 dest_Makefile=$(DESTDIR)$(pkgdatadir)/examples/c++/Makefile
 
diff --git a/manuals_and_examples/example-files.mk b/manuals_and_examples/example-files.mk
new file mode 100644
index 0000000..2705287
--- /dev/null
+++ b/manuals_and_examples/example-files.mk
@@ -0,0 +1,29 @@
+# DO NOT MODIFY THIS FILE
+# This file was autogenerated by the dist-hook target
+nobase_dist_pkgdata_DATA += examples/images/mr_1.pgm
+nobase_dist_pkgdata_DATA += examples/images/mr_1.tif
+nobase_dist_pkgdata_DATA += examples/images/anthur.ppm
+nobase_dist_pkgdata_DATA += examples/images/anthur.tif
+nobase_dist_pkgdata_DATA += examples/images/mr_3.pgm
+nobase_dist_pkgdata_DATA += examples/images/mr_3.tif
+nobase_dist_pkgdata_DATA += examples/images/arrow.tif
+nobase_dist_pkgdata_DATA += examples/images/mr_2.tif
+nobase_dist_pkgdata_DATA += examples/images/arrow.pgm
+nobase_dist_pkgdata_DATA += examples/images/mr_2.pgm
+nobase_dist_pkgdata_DATA += examples/c++/Makefile
+nobase_dist_pkgdata_DATA += examples/c++/basictypes.hh
+nobase_dist_pkgdata_DATA += examples/c++/insertppm.cc
+nobase_dist_pkgdata_DATA += examples/c++/query.cc
+nobase_dist_pkgdata_DATA += examples/c++/avg-cell.cc
+nobase_dist_pkgdata_DATA += examples/c++/lookup.cc
+nobase_dist_pkgdata_DATA += examples/c++/avg-cell-red.cc
+nobase_dist_pkgdata_DATA += examples/rasdl/basictypes.dl
+nobase_dist_pkgdata_DATA += examples/java/Makefile
+nobase_dist_pkgdata_DATA += examples/java/AvgCell.java
+nobase_dist_pkgdata_DATA += examples/java/Query.java
+nobase_dist_pkgdata_DATA += examples/java/Lookup.java
+nobase_dist_pkgdata_DATA += examples/queries/where.ql
+nobase_dist_pkgdata_DATA += examples/queries/trim-sdom.ql
+nobase_dist_pkgdata_DATA += examples/queries/boolean-masking.ql
+nobase_dist_pkgdata_DATA += examples/queries/trim.ql
+nobase_dist_pkgdata_DATA += examples/queries/sdom.ql