diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
| commit | 057a0635e081848ba59964c4a8e0923e521b7fe6 (patch) | |
| tree | cdad9578140d5dbdb2e90525e2ba9cc870ca50b6 /qpid/cpp/src/Makefile.am | |
| parent | cf61dbf9b313f9bd69b392eae8fd8d27d4e609a2 (diff) | |
| download | qpid-python-qpid-3603-5.tar.gz | |
Merge branch 'qpid-3603-4-rebase' into qpid-3603-5qpid-3603-5
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-5@1243748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 9533e37565..4f733e985b 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -106,7 +106,8 @@ mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \ -c $(srcdir)/managementgen.cmake -q -b -o qmf \ $(top_srcdir)/../specs/management-schema.xml \ $(srcdir)/qpid/acl/management-schema.xml \ - $(srcdir)/qpid/cluster/management-schema.xml + $(srcdir)/qpid/cluster/management-schema.xml \ + $(srcdir)/qpid/ha/management-schema.xml $(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp mgen.timestamp: $(mgen_generator) @@ -212,6 +213,7 @@ dmoduleexec_LTLIBRARIES = cmoduleexec_LTLIBRARIES = include cluster.mk +include ha.mk include acl.mk include qmf.mk include qmfc.mk @@ -540,6 +542,9 @@ libqpidbroker_la_SOURCES = \ qpid/broker/Consumer.h \ qpid/broker/Credit.h \ qpid/broker/Credit.cpp \ + qpid/broker/ConsumerFactory.h \ + qpid/broker/ConnectionObserver.h \ + qpid/broker/ConnectionObservers.h \ qpid/broker/Daemon.cpp \ qpid/broker/Daemon.h \ qpid/broker/Deliverable.h \ |