summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Parker <conrad@xiph.org>2010-04-20 08:56:46 +0000
committerConrad Parker <conrad@xiph.org>2010-04-20 08:56:46 +0000
commit1a22b0150b6397a4fd712472b486bdbfdf1c2608 (patch)
treea38d83016bc8063d021c22c8f7722f6371f9fb83
parent884c3f20a43ed8172ba19f6f572f58ba517d1174 (diff)
downloadtremor-1a22b0150b6397a4fd712472b486bdbfdf1c2608.tar.gz
Merge r17150 from trunk/Tremor
Add a pkgconfig file; Adapted from patch by Stefan Kost. NB. this branch has no Version_script, no docs and no Win32 directory, so r17149,r17151,r17152 cannot be applied. git-svn-id: https://svn.xiph.org/branches/lowmem-no-byte/Tremor@17155 0101bb08-14d6-0310-b084-bc0e0c8e3800
-rw-r--r--Makefile.am5
-rw-r--r--configure.in2
-rw-r--r--vorbisidec.pc.in14
3 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 61ca059..b9a31f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I./
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vorbisidec.pc
+
lib_LTLIBRARIES = libvorbisidec.la
libvorbisidec_la_SOURCES = mdct.c dsp.c info.c misc.c \
@@ -26,6 +29,8 @@ includedir = $(prefix)/include/tremor
include_HEADERS = ivorbiscodec.h ivorbisfile.h ogg.h os_types.h config_types.h
+EXTRA_DIST = vorbisidec.pc.in
+
example:
-ln -fs . vorbis
$(MAKE) ivorbisfile_example
diff --git a/configure.in b/configure.in
index bd577ea..b6e6794 100644
--- a/configure.in
+++ b/configure.in
@@ -110,4 +110,4 @@ AC_SUBST(LIBS)
AC_SUBST(DEBUG)
AC_SUBST(PROFILE)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile vorbisidec.pc)
diff --git a/vorbisidec.pc.in b/vorbisidec.pc.in
new file mode 100644
index 0000000..9c09524
--- /dev/null
+++ b/vorbisidec.pc.in
@@ -0,0 +1,14 @@
+# libvorbisidec pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: vorbisidec
+Description: vorbisidec is the integer Ogg Vorbis library
+Version: @VERSION@
+Requires: ogg
+Conflicts:
+Libs: -L${libdir} -lvorbisidec -lm
+Cflags: -I${includedir}