diff options
| author | Alan Conway <aconway@apache.org> | 2007-05-01 16:10:42 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-05-01 16:10:42 +0000 |
| commit | f102270694ba9f09bf66a988246de8afe779c1a9 (patch) | |
| tree | 1eb283c69e978939434f0b2e41eb01e1da07410d /cpp/gen | |
| parent | d7691e4e39eeba22124dabe047b5656449bc2ab5 (diff) | |
| download | qpid-python-f102270694ba9f09bf66a988246de8afe779c1a9.tar.gz | |
Makefile fixes to get make distcheck passing.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@534143 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/gen')
| -rw-r--r-- | cpp/gen/Makefile.am | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am index 6c20963134..c1f27c8700 100644 --- a/cpp/gen/Makefile.am +++ b/cpp/gen/Makefile.am @@ -3,11 +3,11 @@ # -include gen-src.mk -BUILT_SOURCES = gen-src.mk qpid/timestamp $(generated_cpp) $(generated_h) - # Distribute the generated sources, since the code generator depends # on tools that may not be available in the build environment. -EXTRA_DIST = $(BUILT_SOURCES) +GEN_SRC=$(generated_cpp) $(generated_h) +BUILT_SOURCES = $(GEN_SRC) gen-src.mk +EXTRA_DIST = $(BUILT_SOURCES) # Install generated headers nobase_include_HEADERS = $(generated_h) @@ -22,17 +22,24 @@ gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools spec_dir = $(top_srcdir)/../specs spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml -qpid/timestamp $(generated_cpp) $(generated_h): $(spec) $(java_sources) $(cxx_templates) +$(GEN_SRC): $(spec) $(java_sources) $(cxx_templates) mkdir -p qpid/framing cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java $(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \ -c -o qpid/framing -t $(gentools_dir)/templ.cpp $(spec) touch qpid/timestamp -gen-src.mk: qpid gen-src-mk.sh +gen-src.mk: $(BUILT_SOURCES) gen-src-mk.sh $(srcdir)/gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t mv $@-t $@ +else +# No code generator, we must be in a distribution tree. +# Copy gen-src.mk from the source dir as make does not look for +# include files in the VPATH +gen-src.mk: $(srcdir)/gen-src.mk + cp $< $@ +DISTCLEANFILES=gen-src.mk endif maintainer-clean-local: |