diff options
| author | François Andriot <francois.andriot@free.fr> | 2015-10-15 04:47:35 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-10-15 04:47:35 +0200 |
| commit | d67c4c24d28fb80653b1d499dcb7cd36284883fd (patch) | |
| tree | 9a29c426768dd7b35ae7ecd6107599f4cf57654d | |
| parent | b4697bcfd6567f704e01927fdaf77f3ab5b9112b (diff) | |
| download | akode-d67c4c24d28fb80653b1d499dcb7cd36284883fd.tar.gz akode-d67c4c24d28fb80653b1d499dcb7cd36284883fd.zip | |
Add multilib support
[taken from Fedora patches]
| -rw-r--r-- | akode/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | akode/Makefile.am | 5 | ||||
| -rw-r--r-- | akode/akode-config.in | 9 | ||||
| -rw-r--r-- | akode/akode.pc.in | 10 | ||||
| -rw-r--r-- | akode/configure.in.in | 1 |
5 files changed, 24 insertions, 5 deletions
diff --git a/akode/CMakeLists.txt b/akode/CMakeLists.txt index 26cc5c0..b7ab6a5 100644 --- a/akode/CMakeLists.txt +++ b/akode/CMakeLists.txt @@ -24,6 +24,10 @@ configure_file( akode-config.in akode-config @ONLY ) install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/akode-config DESTINATION ${BIN_INSTALL_DIR} ) +configure_file( akode.pc.in akode.pc @ONLY ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/akode.pc + DESTINATION ${PKGCONFIG_INSTALL_DIR} ) + ##### build ##################################### diff --git a/akode/Makefile.am b/akode/Makefile.am index 99455d5..a30cdd8 100644 --- a/akode/Makefile.am +++ b/akode/Makefile.am @@ -1,3 +1,8 @@ bin_SCRIPTS = akode-config SUBDIRS= lib plugins akodeplay + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = akode.pc + +EXTRA_DIST = akode.pc.in diff --git a/akode/akode-config.in b/akode/akode-config.in index b4263be..d1d8457 100644 --- a/akode/akode-config.in +++ b/akode/akode-config.in @@ -15,9 +15,8 @@ EOH } prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +akode_libs="`pkg-config --libs akode`" +akode_cflags="`pkg-config --cflags akode`" flags="" @@ -29,10 +28,10 @@ while test $# -gt 0 do case $1 in --libs) - flags="$flags -L$libdir -lakode" + flags="$flags $akode_libs" ;; --cflags) - flags="$flags -I$includedir" + flags="$flags $akode_cflags" ;; --version) echo 2.0.2 diff --git a/akode/akode.pc.in b/akode/akode.pc.in new file mode 100644 index 0000000..d17b2ea --- /dev/null +++ b/akode/akode.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: akode +Description: aKode is a simple audio-decoding frame-work +Version: 2.0.2 +Libs: -L${libdir} -lakode +Cflags: -I${includedir} diff --git a/akode/configure.in.in b/akode/configure.in.in index 80d0114..2b0ef60 100644 --- a/akode/configure.in.in +++ b/akode/configure.in.in @@ -1,5 +1,6 @@ dnl don't remove the below dnl AC_OUTPUT(akode/akode-config) +dnl AC_OUTPUT(akode/akode.pc) AC_CONFIG_HEADER(akode/lib/akode_export.h) |