Put the libbabeltrace-ctf specific parts of babeltrace.pc into a babeltrace-ctf.pc...

On some distributions libbabeltrace and libbabeltrace-ctf are packaged
into separate packages. This means they should have their own pkg-config
file.

The babeltrace-ctf.pc file requires the babeltrace.pc one.

With this change, to have the ctf support in libbabeltrace a pkg-config
user will need to specify the babeltrace-ctf package. To compile and
link with only the base libbabeltrace, the package babeltrace would be
used.

Fixes #550

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index cdfad5a8b48c52a8ba007b2cceec3e8e5c5eb3a1..e5eca77f506b4fcbf0bf7b5e1e379d145115bb91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,4 +10,4 @@ dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc
+pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc

diff --git a/babeltrace-ctf.pc.in b/babeltrace-ctf.pc.in
new file mode 100644 (file)
index 0000000..8237607
--- /dev/null
+++ b/babeltrace-ctf.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Babeltrace CTF parser
+Description: libbabeltrace-ctf provides the specific bits necessary to read a Common Trace Format (CTF) trace.
+Version: @PACKAGE_VERSION@
+Requires: babeltrace
+Requires.private: 
+Libs: -L${libdir} -lbabeltrace-ctf
+Cflags: -I${includedir} 
+

diff --git a/babeltrace.pc.in b/babeltrace.pc.in
index 12349dd96e2053cb2325bbe7f08c18866291221d..7c33f2816ee6f7a6fadf023c4ae2a0f64b31e0ad 100644 (file)
--- a/babeltrace.pc.in
+++ b/babeltrace.pc.in
@@ -9,6 +9,6 @@ Common Trace Format (CTF).
 Version: @PACKAGE_VERSION@
 Requires:
 Requires.private: uuid popt
-Libs: -L${libdir} -lbabeltrace -lbabeltrace-ctf
+Libs: -L${libdir} -lbabeltrace
 Cflags: -I${includedir} 
 

diff --git a/configure.ac b/configure.ac
index 2b9cc0de5deadca83a22446cee0ee97c2ac91c38..fdefe2af1061148ef85c0def5de4b7fe64e84483 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,5 +137,6 @@ AC_CONFIG_FILES([
        extras/Makefile
        extras/valgrind/Makefile
        babeltrace.pc
+       babeltrace-ctf.pc
 ])
 AC_OUTPUT