Skip to content

Commit

Permalink
Put the libbabeltrace-ctf specific parts of babeltrace.pc into a babe…
Browse files Browse the repository at this point in the history
…ltrace-ctf.pc file

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 <[email protected]>
Signed-off-by: Mathieu Desnoyers <[email protected]>
  • Loading branch information
greenscientist authored and compudj committed Aug 15, 2013
1 parent 331d78f commit e7a7efd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 13 additions & 0 deletions babeltrace-ctf.pc.in
Original file line number Diff line number Diff line change
@@ -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}

2 changes: 1 addition & 1 deletion babeltrace.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}

1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,6 @@ AC_CONFIG_FILES([
extras/Makefile
extras/valgrind/Makefile
babeltrace.pc
babeltrace-ctf.pc
])
AC_OUTPUT

0 comments on commit e7a7efd

Please sign in to comment.