Author: astitcher
Date: Thu Nov 10 22:14:40 2011
New Revision: 1200597
URL: http://svn.apache.org/viewvc?rev=1200597&view=rev
Log:
QPID-3607: pkg config for qmf2 library
- Added new qmf2.pc file and make install logic for it
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/qmf.mk
Modified: qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1200597&r1=1200596&r2=1200597&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Thu Nov 10 22:14:40 2011
@@ -543,6 +543,7 @@ AC_CONFIG_FILES([
src/tests/test_env.sh
src/tests/install_env.sh
src/qpid.pc
+ src/qmf2.pc
docs/man/Makefile
docs/api/Makefile
docs/api/user.doxygen
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1200597&r1=1200596&r2=1200597&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Nov 10 22:14:40 2011
@@ -1364,5 +1364,12 @@ if (UNIX)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc
DESTINATION ${QPID_INSTALL_LIBDIR}/pkgconfig
COMPONENT ${QPID_COMPONENT_COMMON})
+
+ add_dependencies(pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmf2.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc
+ DESTINATION ${QPID_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT ${QPID_COMPONENT_COMMON})
endif (UNIX)
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1200597&r1=1200596&r2=1200597&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Thu Nov 10 22:14:40 2011
@@ -69,6 +69,7 @@ EXTRA_DIST= $(platform_dist) $(rgen_srcs
# Define variables that are be appended to by this file and included .mk files.
nobase_include_HEADERS =
libqpidcommon_la_SOURCES =
+pkgconfig_DATA =
## Generated code
@@ -900,4 +901,4 @@ install-data-local:
# Support for pkg-config
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = qpid.pc
+pkgconfig_DATA += qpid.pc
Modified: qpid/trunk/qpid/cpp/src/qmf.mk
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf.mk?rev=1200597&r1=1200596&r2=1200597&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf.mk (original)
+++ qpid/trunk/qpid/cpp/src/qmf.mk Thu Nov 10 22:14:40 2011
@@ -172,3 +172,5 @@ QMFENGINE_VERSION_INFO = 1:1:0
libqmf_la_LDFLAGS = -version-info $(QMF_VERSION_INFO)
libqmf2_la_LDFLAGS = -version-info $(QMF2_VERSION_INFO)
libqmfengine_la_LDFLAGS = -version-info $(QMFENGINE_VERSION_INFO)
+
+pkgconfig_DATA += qmf2.pc
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
