From 67cb9d3c75bada36fae0086a04b6b1e9fc92459f Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Fri, 5 Sep 2008 14:11:23 +0000
Subject: QPID-1274 - Improved packaging for management agent and code
 generation tool

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@692450 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/Makefile.am |  8 +++-----
 qpid/cpp/src/qmf.mk      | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 qpid/cpp/src/qmf.mk

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 3f46874b20..25c27549c3 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -28,10 +28,8 @@ $(rgen_generator):
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/main.py -m $(srcdir)/managementgen.mk \
-	$(top_srcdir)/../specs/management-schema.xml \
-	$(top_srcdir)/../specs/management-types.xml \
-	$(mgen_dir)/templates gen/qpid/management
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
+	$(top_srcdir)/../specs/management-schema.xml gen/qpid/management
 
 $(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
 mgen.timestamp: $(mgen_generator)
@@ -100,6 +98,7 @@ lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
 
 include cluster.mk
 include acl.mk
+include qmf.mk
 
 # The logger library uses boost::date_time to format time.
 # We have to disable the unused parameters warning to get around
@@ -325,7 +324,6 @@ libqpidclient_la_LIBADD = libqpidcommon.la  -luuid
 
 libqpidclient_la_SOURCES =			\
   $(rgen_client_srcs)				\
-  qpid/agent/ManagementAgentImpl.cpp \
   qpid/client/AckPolicy.cpp			\
   qpid/client/Bounds.cpp			\
   qpid/client/ConnectionImpl.cpp		\
diff --git a/qpid/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
new file mode 100644
index 0000000000..3b60be1b96
--- /dev/null
+++ b/qpid/cpp/src/qmf.mk
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http:#www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# qmf agent library makefile fragment, to be included in Makefile.am
+# 
+lib_LTLIBRARIES += libqmfagent.la
+
+libqmfagent_la_SOURCES = \
+  qpid/agent/ManagementAgent.h \
+  qpid/agent/ManagementAgentImpl.cpp \
+  qpid/agent/ManagementAgentImpl.h
+
+libqmfagent_la_LIBADD = libqpidclient.la
+
-- 
cgit v1.2.1