diff options
| author | Alan Conway <aconway@apache.org> | 2007-01-25 16:45:48 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-01-25 16:45:48 +0000 |
| commit | 62d0b170d8a7c29ec3a00b3af9cc5b43dccf2db4 (patch) | |
| tree | df1a48d5c98bbf3bbeb75a998e09df4febb08c57 /cpp/gen/Makefile.am | |
| parent | f5038f13d14d99e2b96482e3536ce3312703a56b (diff) | |
| download | qpid-python-62d0b170d8a7c29ec3a00b3af9cc5b43dccf2db4.tar.gz | |
* qpidc.spec.in: updated to release 3 for RPM.
* gen/make-gen-src-mk.sh: fixed problem with makefile generation in a new checkout.
* Other Makefile.am: added missing files to maintainer-clean.
* Added missing svn-ignores.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499845 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/gen/Makefile.am')
| -rw-r--r-- | cpp/gen/Makefile.am | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am index 5d9473f615..e1707b86c4 100644 --- a/cpp/gen/Makefile.am +++ b/cpp/gen/Makefile.am @@ -6,7 +6,7 @@ pkginclude_HEADERS=$(generated_headers) # Distribute the generated sources, at least for now, since # the generator code is in java. EXTRA_DIST = $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk # Don't attempt to run the code generator unless configure has set # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed @@ -26,26 +26,7 @@ $(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates) -c -o . -t $(gentools_dir)/templ.cpp $(spec) touch timestamp -DISTCLEANFILES = gen-src.mk gen-src.mk: timestamp - ( echo 'generated_sources = '\\ \ - && ls *.cpp | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ - echo 'generated_headers = '\\ \ - && ls *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ - ) > $@-t - ( echo if CAN_GENERATE_CODE; \ - echo 'java_sources = '\\ \ - && find $(gentools_srcdir) -name '*.java' \ - | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ - echo 'cxx_templates = '\\ \ - && find $(gentools_dir)/templ.cpp -name '*.tmpl' \ - | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ - echo '# Empty rules, in case any of these files is removed,'; \ - echo '# renamed, or no longer generated.'; \ - echo '$$(spec):'; \ - echo '$$(java_sources):'; \ - echo '$$(cxx_templates):'; \ - echo endif \ - ) >> $@-t + ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) >> $@-t mv $@-t $@ endif |