diff options
| author | Alan Conway <aconway@apache.org> | 2009-07-27 21:32:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-07-27 21:32:16 +0000 |
| commit | 77e93f5453f3b9878c3e27b0e99a365356c5264c (patch) | |
| tree | c6e72c764dab31648c39de97ec7154e893662eb5 /cpp/src/Makefile.am | |
| parent | bcf89b1af8b1d4a0262530b50e5433cdaffb91f0 (diff) | |
| download | qpid-python-77e93f5453f3b9878c3e27b0e99a365356c5264c.tar.gz | |
Separate generated public header files from non-public headers, generated code re-organization.
The gen/ directory has been removed, code is now generated into:
$(builddir)/src - all .cpp files and non-public .h files.
$(builddir)/include - all public .h files.
The gen/ directory was originally intended to separate generated code
from hand-written code. However both automake and cmake allow you to
direct all build output, including generated code, into a separate
build directory. In fact both recommend you build this way.
Keeping the gen/ directory meant there would have been a total of 8
places to look for header files, all the combinations of
builddir/srcdir, src/include and gen/no-gen. This was a mess, 4 is bad
enough.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@798291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 1b1b9aadfb..1d5e52408a 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -82,7 +82,7 @@ specs=$(amqp_0_10_xml) $(top_srcdir)/xml/cluster.xml # Ruby generator. rgen_dir=$(top_srcdir)/rubygen -rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate gen $(specs) all $(srcdir)/rubygen.mk +rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . ../include $(specs) all $(srcdir)/rubygen.mk $(rgen_srcs) $(srcdir)/rubygen.mk: rgen.timestamp rgen.timestamp: $(rgen_generator) $(specs) @@ -91,7 +91,7 @@ $(rgen_generator): # Management generator. mgen_dir=$(top_srcdir)/managementgen -mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -q -b -o gen/qmf \ +mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -q -b -o qmf \ $(top_srcdir)/../specs/management-schema.xml \ $(srcdir)/qpid/acl/management-schema.xml \ $(srcdir)/qpid/cluster/management-schema.xml @@ -109,7 +109,7 @@ include $(srcdir)/managementgen.mk ## Compiler flags AM_CXXFLAGS = $(WARNING_CFLAGS) AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) -INCLUDES = -Igen -I$(srcdir)/gen -I$(top_srcdir)/include +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(srcdir) -I=$(builddir) # # Destination for intalled programs and tests defined here |