diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-11 19:53:32 +0000 |
| commit | 1fd57585c8ea536630d69de3fc16ce0c6f81c82b (patch) | |
| tree | dc6a92d539d14a333c5033938d13b08edad9c9b9 /cpp/src/Makefile.am | |
| parent | f7f31c6a720d23749b23735b71cd401d93ded9b5 (diff) | |
| download | qpid-python-1fd57585c8ea536630d69de3fc16ce0c6f81c82b.tar.gz | |
* cpp/qpidc.spec.in: Added qpidd-devel sub-package.
* cpp/configure.ac: Use a more reliable srcdir test file.
* cpp/docs/api/Makefile.am: Fix bug in VPATH builds.
* cpp/gentools/*, src/**.h,**.cpp: Fix #includes of files in gen/
* cpp/rpm/Makefile.am: Removed. RPM targets defined in top level Makefile.am.
* cpp/Makefile.am: Add RPM targets, fix VPATH bug with RPM targets
* cpp/rpm/README.qpidd-devel: placeholder for qpidd-devel documentation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527639 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/Makefile.am')
| -rw-r--r-- | cpp/src/Makefile.am | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index c18eb4f719..32c2e1a00d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = . tests AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) # -I top_builddir for config.h -INCLUDES = -I$(top_builddir) -I$(srcdir)/gen +INCLUDES = -I$(top_builddir) -I$(srcdir) qpidd_LDADD = \ libqpidbroker.la \ @@ -156,7 +156,9 @@ libqpidclient_la_SOURCES = \ $(client)/ResponseHandler.cpp \ $(client)/ReturnedMessageHandler.cpp -nobase_pkginclude_HEADERS = \ +# Install into include/qpid rather than include/qpidc. +qpidincludedir=$(includedir)/qpid +nobase_qpidinclude_HEADERS = \ $(generated_headers) \ $(platform_hdr) \ $(broker)/AccumulatedAck.h \ @@ -280,14 +282,11 @@ nobase_pkginclude_HEADERS = \ ExceptionHolder.h \ QpidError.h \ SharedObject.h \ - doxygen_mainpage.h \ shared_ptr.h # Distribute the generated sources, at least for now, since # the generator code is in java. EXTRA_DIST += $(BUILT_SOURCES) -maintainer-clean-local: - rm -rf $(gen) # Don't attempt to run the code generator unless configure has set # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed @@ -297,12 +296,7 @@ if CAN_GENERATE_CODE gentools_dir = $(srcdir)/../gentools spec_dir = $(srcdir)/../../specs - -# FIXME aconway 2007-01-04: Enabling Basic class until -# new messaging class is ready to replace it. -# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml - gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools $(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am |