From a3aaa263858f07d37e5860136300f76fab8d7ecd Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 23 Nov 2007 13:37:42 +0000
Subject: QPID-689 from tross@redhat.com.

This patch introduces formal schema specification for management and
code generation for management classes.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@597662 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/Makefile.am | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'cpp/src/Makefile.am')

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 5c75fc7ce6..b3c6b8a13d 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -20,11 +20,19 @@ if GENERATE
 rgen_dir=$(top_srcdir)/rubygen
 rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate $(srcdir)/gen $(specs) all $(srcdir)/rubygen.mk
 
+# Management generator.
+mgen_dir=$(top_srcdir)/managementgen
+mgen_cmd=$(mgen_dir)/main.py -o $(srcdir)/gen/qpid/management \
+	-t $(top_srcdir)/../specs/management-types.xml \
+	-s $(top_srcdir)/../specs/management-schema.xml \
+	-i $(mgen_dir)/templates -m $(srcdir)/managementgen.mk
+
 endif				# GENERATE
 
 include $(srcdir)/rubygen.mk
+include $(srcdir)/managementgen.mk
 
-DISTCLEANFILES=rubygen.mk
+DISTCLEANFILES=rubygen.mk managementgen.mk
 
 # Code generated by C++
 noinst_PROGRAMS=generate_MaxMethodBodySize_h
@@ -137,6 +145,7 @@ libqpidcommon_la_SOURCES = \
 
 libqpidbroker_la_LIBADD = libqpidcommon.la -lboost_iostreams
 libqpidbroker_la_SOURCES = \
+  $(mgen_broker_cpp) \
   qpid/broker/Broker.cpp \
   qpid/broker/BrokerAdapter.cpp \
   qpid/broker/BrokerSingleton.cpp \
@@ -189,12 +198,10 @@ libqpidbroker_la_SOURCES = \
   qpid/broker/TxBuffer.cpp \
   qpid/broker/TxPublish.cpp \
   qpid/broker/Vhost.cpp \
-  qpid/management/Broker.cpp \
+  qpid/management/Manageable.cpp \
   qpid/management/ManagementAgent.cpp \
   qpid/management/ManagementExchange.cpp \
-  qpid/management/ManagementObject.cpp \
-  qpid/management/Queue.cpp \
-  qpid/management/Vhost.cpp
+  qpid/management/ManagementObject.cpp
 
 libqpidclient_la_LIBADD = libqpidcommon.la
 libqpidclient_la_SOURCES =			\
@@ -383,15 +390,11 @@ nobase_include_HEADERS = \
   qpid/log/Options.h \
   qpid/log/Selector.h \
   qpid/log/Statement.h \
-  qpid/management/ArgsBrokerEcho.h \
   qpid/management/Args.h \
-  qpid/management/Broker.h \
   qpid/management/Manageable.h \
   qpid/management/ManagementAgent.h \
   qpid/management/ManagementExchange.h \
   qpid/management/ManagementObject.h \
-  qpid/management/Queue.h \
-  qpid/management/Vhost.h \
   qpid/sys/Acceptor.h \
   qpid/sys/AsynchIO.h \
   qpid/sys/AtomicCount.h \
-- 
cgit v1.2.1