diff options
| author | Alan Conway <aconway@apache.org> | 2006-12-04 21:33:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-12-04 21:33:33 +0000 |
| commit | 13752fdeaa9a11a8721f08bc8a16c44aaf2448a1 (patch) | |
| tree | e12d352224dc624df7956ee659fd5114600227e0 | |
| parent | 6a8103aa4ae98c0134fbfc4ac64405ad2aa5f4ee (diff) | |
| download | qpid-python-13752fdeaa9a11a8721f08bc8a16c44aaf2448a1.tar.gz | |
2006-12-04 Jim Meyering <jim@meyering.net>
Changes to make "make distcheck" pass.
* gen/Makefile.am (DISTCLEANFILES): List gen-src.mk here,
rather than distributing it.
(gen-src.mk): Guard emitted java_sources and cxx_templates
templates with "if BUILD_IN_MESSAGE_TREE" conditional.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@482367 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/gen/Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qpid/cpp/gen/Makefile.am b/qpid/cpp/gen/Makefile.am index 8c179dfd06..0529afbf7e 100644 --- a/qpid/cpp/gen/Makefile.am +++ b/qpid/cpp/gen/Makefile.am @@ -26,19 +26,20 @@ endif EXTRA_DIST += timestamp $(generated_sources): timestamp -EXTRA_DIST += gen-src.mk +DISTCLEANFILES = gen-src.mk gen-src.mk: timestamp ( echo 'generated_sources = \' \ && ls *.cpp *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \ ) > $@-t if BUILD_IN_MESSAGE_TREE - ( echo 'java_sources = \' \ + ( echo if BUILD_IN_MESSAGE_TREE; \ + echo 'java_sources = \' \ && find $(gentools_srcdir) -name '*.java' \ - | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \ - ) >> $@-t - ( echo 'cxx_templates = \' \ + | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ + echo 'cxx_templates = \' \ && find $(gentools_dir)/templ.cpp -name '*.tmpl' \ - | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \ + | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ + echo endif \ ) >> $@-t endif mv $@-t $@ |