summaryrefslogtreecommitdiffstats
path: root/manuals_and_examples
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2011-03-05 14:18:25 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-03-07 20:57:37 +0100
commitfef5564a64870ce438d0b1185df521fd54126171 (patch)
tree1bb7f08dbbb9d954cdf416ac9b7015c460ffaa37 /manuals_and_examples
parentd261ea3db63beaf5581c46afcb6c7e297a8010fb (diff)
downloadrasdaman-upstream-fef5564a64870ce438d0b1185df521fd54126171.tar.gz
rasdaman-upstream-fef5564a64870ce438d0b1185df521fd54126171.tar.xz
rasdaman-upstream-fef5564a64870ce438d0b1185df521fd54126171.zip
build: Change dubious wildcard stuff to use +=
Also make sure that the list of files is updated on "make dist".
Diffstat (limited to 'manuals_and_examples')
-rw-r--r--manuals_and_examples/Makefile.am19
-rw-r--r--manuals_and_examples/example-files.mk29
2 files changed, 45 insertions, 3 deletions
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