blob: ee2a58b08827d9ef84de463d07c3ec31bdd3b215 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
commit d67c4c24d28fb80653b1d499dcb7cd36284883fd
Author: François Andriot <francois.andriot@free.fr>
Date: Thu Oct 15 04:47:35 2015 +0200
Add multilib support
[taken from Fedora patches]
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)
|
