Put the libbabeltrace-ctf specific parts of babeltrace.pc into a babeltrace-ctf.pc file.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
AppliedQuoted 10 lines · * Yannick Brosseau ([email protected]) wrote:
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 use.
Fixes #550
merged, thanks!
Mathieu
Quoted 65 lines
Signed-off-by Yannick Brosseau <[email protected]>--- Makefile.am | 2 +- babeltrace-ctf.pc.in | 13 +++++++++++++ babeltrace.pc.in | 2 +- configure.ac | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 babeltrace-ctf.pc.inMakefile.am +1
-1@@ -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.pcbabeltrace-ctf.pc.in new file +13
-0@@ -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} +babeltrace.pc.in +1
-1@@ -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}configure.ac +1
-0@@ -124,5 +124,6 @@ AC_CONFIG_FILES([ extras/Makefile extras/valgrind/Makefile babeltrace.pc + babeltrace-ctf.pc ]) AC_OUTPUTSignature · 1 line
1.7.10.4
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com