Author: aconway
Date: Tue Dec 12 08:05:01 2006
New Revision: 486207
URL: http://svn.apache.org/viewvc?view=rev&rev=486207
Log:
2006-12-11 Alan Conway <[EMAIL PROTECTED]>
* SPECS/qpid-cpp.spec: Draft RPM spec file for C++. Based on
initial draft provided by David Lutterkort <[EMAIL PROTECTED]>
* cpp Makefiles: Renamed libraries with qpid prefix: libqpidclient etc.
* cpp/man/: moved to docs/man/
* docs/api/usr.doxygen: more restricted, user-oriented doc settings.
Added:
incubator/qpid/trunk/qpid/SPECS/
incubator/qpid/trunk/qpid/SPECS/qpid-cpp.spec
incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen
- copied, changed from r485877,
incubator/qpid/trunk/qpid/cpp/docs/api/Doxyfile
incubator/qpid/trunk/qpid/cpp/docs/man/
- copied from r484813, incubator/qpid/trunk/qpid/cpp/man/
incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
- copied, changed from r486205,
incubator/qpid/trunk/qpid/cpp/man/Makefile.am
incubator/qpid/trunk/qpid/cpp/docs/man/qpidd.x
- copied unchanged from r486205, incubator/qpid/trunk/qpid/cpp/man/qpidd.x
incubator/qpid/trunk/qpid/cpp/etc/
incubator/qpid/trunk/qpid/cpp/etc/init.d/
incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd (with props)
Removed:
incubator/qpid/trunk/qpid/cpp/docs/api/Doxyfile
incubator/qpid/trunk/qpid/cpp/man/
Modified:
incubator/qpid/trunk/qpid/cpp/ (props changed)
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/README-dev
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/docs/api/ (props changed)
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Added: incubator/qpid/trunk/qpid/SPECS/qpid-cpp.spec
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/SPECS/qpid-cpp.spec?view=auto&rev=486207
==============================================================================
--- incubator/qpid/trunk/qpid/SPECS/qpid-cpp.spec (added)
+++ incubator/qpid/trunk/qpid/SPECS/qpid-cpp.spec Tue Dec 12 08:05:01 2006
@@ -0,0 +1,121 @@
+Name: qpid-cpp
+Version: 0.1
+Release: 1%{?dist}
+Summary: Qpid is an implementation of the AMQP messaging specification.
+Group: System Environment/Daemons
+License: Apache
+URL: http://incubator.apache.org/qpid/
+# FIXME: Source must be a URL pointing to where the tarball can be downloaded
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# FIXME: The BR's need to be checked against a clean buildroot [lutter]
+BuildRequires: libtool
+BuildRequires: apr-devel
+BuildRequires: boost-devel
+BuildRequires: cppunit
+BuildRequires: cppunit-devel
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: help2man
+BuildRequires: pkgconfig
+
+# FIXME: aconway don't think this is required, I don't have it installed.
+# BuildRequires: check-devel
+# FIXME: For libuuid. aconway: Why do we depend on libuuid?
+BuildRequires: e2fsprogs-devel
+
+Requires: apr
+Requires: boost
+
+%description
+Qpid-cpp is a C++ implementation of the AMQP messaging specification.
+
+%package client
+Summary: Libraries for Qpid client applications.
+Group: System Environment/Libraries
+
+%description client
+Run-time libraries for Qpid C++ clients. Qpid clients exchange messages
+with an AMQP message broker using the AMQP protocol.
+
+%package client-devel
+Summary: Headers & libraries for developing Qpid client applications.
+Group: Development/System
+Requires: %name-client = %version-%release
+Requires: libtool
+Requires: apr-devel
+Requires: boost-devel
+Requires: cppunit
+Requires: cppunit-devel
+
+%description client-devel
+Libraries and header files for developing AMQP clients in C++ using Qpid.
+Qpid implements the AMQP messaging specification.
+
+
+%package broker
+Summary: The Qpid message broker daemon.
+Group: System Environment/Daemons
+Requires: %name-client = %version-%release
+
+%description broker
+A message broker daemon that receives stores and routes messages using
+the open AMQP messaging protocol.
+
+
+%prep
+%setup -q
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%_localstatedir/run/qpid
+mkdir -p $RPM_BUILD_ROOT%_localstatedir/lib/qpid
+rm -f $RPM_BUILD_ROOT%_libdir/*.a
+rm -f $RPM_BUILD_ROOT%_libdir/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%check
+make check
+
+%files client
+%defattr(-,root,root,-)
+# FIXME: A Changelog or NEWS file might be nice
+%doc LICENSE.txt NOTICE.txt
+%_libdir/libqpidcommon.so.0
+%_libdir/libqpidcommon.so.0.1.0
+%_libdir/libqpidclient.so.0
+%_libdir/libqpidclient.so.0.1.0
+
+%files client-devel
+%defattr(-,root,root,-)
+%_includedir/qpid/*.h
+%_libdir/libqpidcommon.so
+%_libdir/libqpidclient.so
+
+%files broker
+%_libdir/libqpidbroker.so.0
+%_libdir/libqpidbroker.so.0.1.0
+%_sbindir/qpidd
+%_mandir/man1/qpidd.*
+%_localstatedir/run/qpid
+%_localstatedir/lib/qpid
+
+#FIXME: Fix Makefile.am to install etc/init.d/qpidd properly:
+#%_sysconfdir/rc.d/init.d/qpidd
+
+%changelog
+* Mon Dec 11 2006 Alan Conway <[EMAIL PROTECTED]> - 0.1-1
+- Second cut, still needs work and testing.
+
+* Fri Dec 8 2006 David Lutterkort <[EMAIL PROTECTED]> - 0.1-1
+- Initial version based on Jim Meyering's sketch and discussions with Alan
+ Conway
+
Propchange: incubator/qpid/trunk/qpid/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 12 08:05:01 2006
@@ -9,3 +9,5 @@
stamp-h1
libtool
config.in
+qpid-cpp-0.1.tar.bz2
+qpid-cpp-0.1.tar.gz
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Tue Dec 12 08:05:01 2006
@@ -3,7 +3,7 @@
EXTRA_DIST = README-dist DESIGN LICENSE.txt NOTICE.txt README.rhel3
-SUBDIRS = gen lib tests src docs/api man
+SUBDIRS = gen lib tests src docs/api docs/man
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
Modified: incubator/qpid/trunk/qpid/cpp/README-dev
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README-dev?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README-dev (original)
+++ incubator/qpid/trunk/qpid/cpp/README-dev Tue Dec 12 08:05:01 2006
@@ -15,7 +15,6 @@
* libtool <http://www.gnu.org/software/libtool/>
* pkgconfig <http://pkgconfig.freedesktop.org/wiki/> (aka pkg-config)
-
Optional: to re-generated generated code from the XML specification:
* java 5
@@ -28,7 +27,7 @@
If you use yum to install packages, do the command from the README-dist then:
-# yum install apr-devel cppunit-devel pkgconfig boost-devel doxygen graphviz
+# yum install apr-devel cppunit-devel pkgconfig boost-devel doxygen graphviz
help2man pkgconfig
== Recent changes ==
@@ -68,6 +67,7 @@
Before building a fresh checkout do:
./bootstrap
+ ./configure
This generates config, makefiles and the like - check the script for
details. You only need to do this once, "make" will keep everything up
@@ -86,9 +86,9 @@
make distclean
mkdir .build-dbg .build-opt
(cd .build-opt
- ../configure --enable-warnings --prefix=/tmp/x && make && make check)
+ ../configure --prefix=/tmp/x && make && make check)
(cd .build-dbg
- ../configure --enable-warnings CXXFLAGS=-g --prefix=/tmp/x \
+ ../configure CXXFLAGS=-g --prefix=/tmp/x \
&& make && make check)
=== Portability ===
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Tue Dec 12 08:05:01 2006
@@ -41,12 +41,8 @@
build=yes
AC_CHECK_PROGS([JAVA], [java], [no])
AC_CHECK_PROGS([JAVAC], [javac], [no])
-build=yes
-test x$JAVA = xno && build=no
-test x$JAVAC = xno && build=no
-test -d $srcdir/../gentools || build=no
-test -d $srcdir/../specs || build=no
-AM_CONDITIONAL([BUILD_IN_MESSAGE_TREE], [test x$build = xyes])
+AM_CONDITIONAL([CAN_GENERATE_CODE],
+ [test x$JAVA = xyes -a x$JAVAC = xyes -a -d $srcdir/../gentools -a -d
$srcdir/../specs ])
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
@@ -130,8 +126,8 @@
lib/client/Makefile
lib/broker/Makefile
src/Makefile
- man/Makefile
tests/Makefile
+ docs/man/Makefile
docs/api/Makefile
])
Propchange: incubator/qpid/trunk/qpid/cpp/docs/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 12 08:05:01 2006
@@ -1,2 +1,4 @@
Makefile.in
Makefile
+doxygen.tstamp
+html
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Tue Dec 12 08:05:01 2006
@@ -1,8 +1,9 @@
-html: Doxyfile doxygen.tstamp
+html: user.doxygen doxygen.tstamp
-# TODO aconway 2006-12-07: devdoc target to generate doc for all
-# headers, with private/protected functions.
+dist-hook: html
+
+EXTRA_DIST=html
SOURCES = \
$(wildcard $(topsrcdir)/gen/*.h) \
@@ -12,7 +13,7 @@
$(wildcard $(topsrcdir)/lib/client/*.h)
doxygen.tstamp: $(SOURCES)
- doxygen
+ doxygen user.doxygen
touch $@
clean-local:
@@ -20,7 +21,7 @@
HTML_TARGET_DIR=$(pkgdatadir)/api/html
-install-data-local:
+install-data-local:
installfiles=`echo html/*`; \
if test "$$installfiles" = 'html/*'; \
then echo '-- Nothing to install' ; \
Copied: incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen (from r485877,
incubator/qpid/trunk/qpid/cpp/docs/api/Doxyfile)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen?view=diff&rev=486207&p1=incubator/qpid/trunk/qpid/cpp/docs/api/Doxyfile&r1=485877&p2=incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Doxyfile (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen Tue Dec 12 08:05:01 2006
@@ -1,4 +1,10 @@
-# NB: requires doxygen and graphviz - install with yum.
+# ----------------------------------------------------------------
+# Doxygen settings for Qpid user documentation.
+#
+# Note: Only public members of classes that are part of the public API
+# should be documented here. For complete developer documentation use
+# the developer.doxygen configuration.
+# ----------------------------------------------------------------
# Doxyfile 1.4.6
@@ -230,12 +236,12 @@
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = YES
+EXTRACT_ALL = NO
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
-EXTRACT_PRIVATE = YES
+EXTRACT_PRIVATE = NO
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -246,7 +252,7 @@
# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
-EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_CLASSES = NO
# This flag is only useful for Objective-C code. When set to YES local
# methods, which are defined in the implementation section but not in
@@ -282,7 +288,7 @@
# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
-HIDE_IN_BODY_DOCS = NO
+HIDE_IN_BODY_DOCS = YES
# The INTERNAL_DOCS tag determines if documentation
# that is typed after a \internal command is included. If the tag is set
@@ -557,7 +563,7 @@
# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
-SOURCE_BROWSER = YES
+SOURCE_BROWSER = NO
# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
@@ -723,7 +729,7 @@
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature.
-GENERATE_TREEVIEW = NO
+GENERATE_TREEVIEW = YES
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
@@ -1115,12 +1121,12 @@
# collaboration diagrams in a style similar to the OMG's Unified Modeling
# Language.
-UML_LOOK = NO
+UML_LOOK = YES
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
-TEMPLATE_RELATIONS = NO
+TEMPLATE_RELATIONS = YES
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
# tags are set to YES then doxygen will generate a graph for each documented
Copied: incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am (from r486205,
incubator/qpid/trunk/qpid/cpp/man/Makefile.am)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am?view=diff&rev=486207&p1=incubator/qpid/trunk/qpid/cpp/man/Makefile.am&r1=486205&p2=incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/man/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am Tue Dec 12 08:05:01 2006
@@ -13,6 +13,6 @@
.x.1:
@rm -f $@
@echo "Updating man page $@"
- $(HELP2MAN) --no-info --include=$(srcdir)/$*.x [EMAIL PROTECTED]
../src/$*
+ $(HELP2MAN) --no-info --include=$(srcdir)/$*.x [EMAIL PROTECTED]
../../src/$*
@chmod a-w [EMAIL PROTECTED]
@mv [EMAIL PROTECTED] $@
Added: incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd?view=auto&rev=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd (added)
+++ incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd Tue Dec 12 08:05:01 2006
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# qpidd Startup script for the Qpid messaging daemon.
+#
+# chkconfig: - 85 15
+# description: Qpidd is an AMQP broker. It receives, stores and routes
+# messages sent using the AMQP protcol.
+# processname: qpidd
+# pidfile: /var/run/qpidd.pid
+#
+# NB: add config: entries here when qpidd gets a config file.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/qpidd ]; then
+ . /etc/sysconfig/qpidd
+fi
+
+# Start qpidd in the C locale by default.
+QPIDD_LANG=${QPIDD_LANG-"C"}
+
+qpidd=${QPIDD-/usr/sbin/qpidd}
+prog=qpidd
+pidfile=${PIDFILE-/var/run/qpidd.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/qpidd}
+RETVAL=0
+
+start() {
+ echo -n $"Starting $prog: "
+ LANG=$QPIDD_LANG daemon $qpidd $OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch ${lockfile}
+ return $RETVAL
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc 2 $qpidd
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+ echo -n $"Reloading $prog: "
+ killproc $qpidd -HUP
+ RETVAL=$?
+ echo
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status $qpidd
+ RETVAL=$?
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ condrestart)
+ if [ -f ${pidfile} ] ; then
+ stop
+ start
+ fi
+ ;;
+ reload)
+ reload
+ ;;
+ *)
+ echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
+ exit 1
+esac
+
+exit $RETVAL
Propchange: incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gen/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/gen/Makefile.am Tue Dec 12 08:05:01 2006
@@ -1,38 +1,41 @@
include gen-src.mk
BUILT_SOURCES = $(generated_sources)
+pkginclude_HEADERS=$(generated_headers)
# Distribute the generated sources, at least for now, since
# the generator code is in java.
EXTRA_DIST = $(BUILT_SOURCES)
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+# Don't attempt to run the code generator unless configure has set
+# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
+# to run the code generator are available.
+#
+if CAN_GENERATE_CODE
+
gentools_dir = $(srcdir)/../../gentools
spec_dir = $(srcdir)/../../specs
spec = $(spec_dir)/amqp-8.0.xml
gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
timestamp: $(spec) $(java_sources) $(cxx_templates)
-if BUILD_IN_MESSAGE_TREE
rm -f $(generated_sources)
cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
-c -o . -t $(gentools_dir)/templ.cpp $(spec)
-else
- echo "warning: failed to regenerate gen/*.{cpp,h}" 1>&2
-endif
touch timestamp
-EXTRA_DIST += timestamp
$(generated_sources): timestamp
DISTCLEANFILES = gen-src.mk
gen-src.mk: timestamp
- ( echo 'generated_sources = '\\ \
- && ls *.cpp *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \
+ ( echo 'generated_sources = '\\ \
+ && ls *.cpp | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
+ echo 'generated_headers = '\\ \
+ && ls *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
) > [EMAIL PROTECTED]
-if BUILD_IN_MESSAGE_TREE
- ( echo if BUILD_IN_MESSAGE_TREE; \
+ ( echo if CAN_GENERATE_CODE; \
echo 'java_sources = '\\ \
&& find $(gentools_srcdir) -name '*.java' \
| sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
@@ -41,5 +44,5 @@
| sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
echo endif \
) >> [EMAIL PROTECTED]
-endif
mv [EMAIL PROTECTED] $@
+endif
Modified: incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am Tue Dec 12 08:05:01
2006
@@ -6,9 +6,9 @@
-I$(top_srcdir)/lib/common/framing \
$(APR_CXXFLAGS)
-lib_LTLIBRARIES = libbroker.la
-libbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-libbroker_la_SOURCES = \
+lib_LTLIBRARIES = libqpidbroker.la
+libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
+libqpidbroker_la_SOURCES = \
AccumulatedAck.cpp \
AccumulatedAck.h \
AutoDelete.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am Tue Dec 12 08:05:01
2006
@@ -6,27 +6,28 @@
-I$(top_srcdir)/lib/common/framing \
$(APR_CXXFLAGS)
-lib_LTLIBRARIES = libclient.la
-libclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-libclient_la_SOURCES = \
+lib_LTLIBRARIES = libqpidclient.la
+libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
+libqpidclient_la_SOURCES = \
ClientChannel.cpp \
- ClientChannel.h \
ClientExchange.cpp \
- ClientExchange.h \
ClientMessage.cpp \
- ClientMessage.h \
ClientQueue.cpp \
- ClientQueue.h \
Connection.cpp \
- Connection.h \
Connector.cpp \
- Connector.h \
IncomingMessage.cpp \
- IncomingMessage.h \
MessageListener.cpp \
+ ResponseHandler.cpp \
+ ReturnedMessageHandler.cpp
+pkginclude_HEADERS = \
+ ClientChannel.h \
+ ClientExchange.h \
+ ClientMessage.h \
+ ClientQueue.h \
+ Connection.h \
+ Connector.h \
+ IncomingMessage.h \
MessageListener.h \
MethodBodyInstances.h \
- ResponseHandler.cpp \
ResponseHandler.h \
- ReturnedMessageHandler.cpp \
ReturnedMessageHandler.h
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Tue Dec 12 08:05:01
2006
@@ -10,94 +10,102 @@
apr_src = \
$(apr)/APRAcceptor.cpp \
$(apr)/APRBase.cpp \
- $(apr)/APRBase.h \
$(apr)/APRPool.cpp \
- $(apr)/APRPool.h \
$(apr)/APRSocket.cpp \
- $(apr)/APRSocket.h \
$(apr)/LFProcessor.cpp \
- $(apr)/LFProcessor.h \
$(apr)/LFSessionContext.cpp \
- $(apr)/LFSessionContext.h \
$(apr)/Socket.cpp \
$(apr)/Thread.cpp
+apr_hdr = \
+ $(apr)/APRBase.h \
+ $(apr)/APRPool.h \
+ $(apr)/APRSocket.h \
+ $(apr)/LFProcessor.h \
+ $(apr)/LFSessionContext.h
posix = sys/posix
-posix_src = \
- $(posix)/PosixAcceptor.cpp \
- $(posix)/Socket.cpp \
- $(posix)/Thread.cpp \
- $(posix)/check.cpp \
- $(posix)/check.h \
- $(posix)/EventChannel.cpp \
- $(posix)/EventChannel.h \
- $(posix)/EventChannelThreads.cpp \
+posix_src = \
+ $(posix)/PosixAcceptor.cpp \
+ $(posix)/Socket.cpp \
+ $(posix)/Thread.cpp \
+ $(posix)/check.cpp \
+ $(posix)/EventChannel.cpp \
+ $(posix)/EventChannelThreads.cpp
+posix_hdr = \
+ $(posix)/check.h \
+ $(posix)/EventChannel.h \
$(posix)/EventChannelThreads.h
-EXTRA_DIST=$(posix_src)
+EXTRA_DIST=$(posix_src) $(posix_hdr)
platform_src = $(apr_src)
+platform_hdr = $(apr_hdr)
framing = framing
gen = $(srcdir)/../../gen
-lib_LTLIBRARIES = libcommon.la
-libcommon_la_LIBADD = \
+lib_LTLIBRARIES = libqpidcommon.la
+libqpidcommon_la_LIBADD = \
$(APR_LIBS) \
$(LIB_DLOPEN) \
$(LIB_CLOCK_GETTIME)
-libcommon_la_LDFLAGS = \
+libqpidcommon_la_LDFLAGS = \
-version-info \
$(LIBTOOL_VERSION_INFO_ARG)
-libcommon_la_SOURCES = \
+libqpidcommon_la_SOURCES = \
$(platform_src) \
$(framing)/AMQBody.cpp \
- $(framing)/AMQBody.h \
$(framing)/AMQContentBody.cpp \
+ $(framing)/AMQFrame.cpp \
+ $(framing)/AMQHeaderBody.cpp \
+ $(framing)/AMQHeartbeatBody.cpp \
+ $(framing)/AMQMethodBody.cpp \
+ $(framing)/BasicHeaderProperties.cpp \
+ $(framing)/BodyHandler.cpp \
+ $(framing)/Buffer.cpp \
+ $(framing)/FieldTable.cpp \
+ $(framing)/InitiationHandler.cpp \
+ $(framing)/ProtocolInitiation.cpp \
+ $(framing)/ProtocolVersion.cpp \
+ $(framing)/ProtocolVersionException.cpp \
+ $(framing)/Value.cpp \
+ $(gen)/AMQP_ClientProxy.cpp \
+ $(gen)/AMQP_MethodVersionMap.cpp \
+ $(gen)/AMQP_ServerProxy.cpp \
+ Exception.cpp \
+ ExceptionHolder.cpp \
+ QpidError.cpp \
+ sys/Runnable.cpp \
+ sys/Time.cpp
+
+nobase_pkginclude_HEADERS = \
+ $(platform_hdr) \
+ $(framing)/AMQBody.h \
$(framing)/AMQContentBody.h \
$(framing)/AMQDataBlock.h \
- $(framing)/AMQFrame.cpp \
$(framing)/AMQFrame.h \
- $(framing)/AMQHeaderBody.cpp \
$(framing)/AMQHeaderBody.h \
- $(framing)/AMQHeartbeatBody.cpp \
$(framing)/AMQHeartbeatBody.h \
- $(framing)/AMQMethodBody.cpp \
$(framing)/AMQMethodBody.h \
- $(framing)/BasicHeaderProperties.cpp \
$(framing)/BasicHeaderProperties.h \
- $(framing)/BodyHandler.cpp \
$(framing)/BodyHandler.h \
- $(framing)/Buffer.cpp \
$(framing)/Buffer.h \
- $(framing)/FieldTable.cpp \
$(framing)/FieldTable.h \
$(framing)/FramingContent.cpp \
$(framing)/FramingContent.h \
$(framing)/HeaderProperties.h \
- $(framing)/InitiationHandler.cpp \
$(framing)/InitiationHandler.h \
$(framing)/InputHandler.h \
$(framing)/OutputHandler.h \
- $(framing)/ProtocolInitiation.cpp \
$(framing)/ProtocolInitiation.h \
- $(framing)/ProtocolVersion.cpp \
$(framing)/ProtocolVersion.h \
- $(framing)/ProtocolVersionException.cpp \
$(framing)/ProtocolVersionException.h \
- $(framing)/Value.cpp \
$(framing)/Value.h \
$(framing)/amqp_framing.h \
$(framing)/amqp_types.h \
- $(gen)/AMQP_ClientProxy.cpp \
- $(gen)/AMQP_MethodVersionMap.cpp \
- $(gen)/AMQP_ServerProxy.cpp \
- Exception.cpp \
Exception.h \
- ExceptionHolder.cpp \
ExceptionHolder.h \
- QpidError.cpp \
QpidError.h \
SharedObject.h \
sys/Acceptor.h \
@@ -105,7 +113,6 @@
sys/Module.h \
sys/Monitor.h \
sys/Mutex.h \
- sys/Runnable.cpp \
sys/Runnable.h \
sys/SessionContext.h \
sys/SessionHandler.h \
@@ -113,6 +120,5 @@
sys/ShutdownHandler.h \
sys/Socket.h \
sys/Thread.h \
- sys/Time.cpp \
sys/Time.h \
sys/TimeoutHandler.h
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Dec 12 08:05:01 2006
@@ -7,8 +7,8 @@
-I$(top_srcdir)/lib/common/sys
LDADD = \
- ../lib/broker/libbroker.la \
- ../lib/common/libcommon.la
+ ../lib/broker/libqpidbroker.la \
+ ../lib/common/libqpidcommon.la
-bin_PROGRAMS = qpidd
+sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=486207&r1=486206&r2=486207
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Tue Dec 12 08:05:01 2006
@@ -71,9 +71,9 @@
abs_builddir = @abs_builddir@
extra_libs = $(CPPUNIT_LIBS)
-lib_client = $(abs_builddir)/../lib/client/libclient.la
-lib_common = $(abs_builddir)/../lib/common/libcommon.la
-lib_broker = $(abs_builddir)/../lib/broker/libbroker.la
+lib_client = $(abs_builddir)/../lib/client/libqpidclient.la
+lib_common = $(abs_builddir)/../lib/common/libqpidcommon.la
+lib_broker = $(abs_builddir)/../lib/broker/libqpidbroker.la
gen.mk: Makefile.am
( \
