[xiph-commits] r17155 - branches/lowmem-no-byte/Tremor

[conrad at svn.xiph.org]

Author: conrad
Date: 2010-04-20 01:56:46 -0700 (Tue, 20 Apr 2010)
New Revision: 17155

Added:
   branches/lowmem-no-byte/Tremor/vorbisidec.pc.in
Modified:
   branches/lowmem-no-byte/Tremor/Makefile.am
   branches/lowmem-no-byte/Tremor/configure.in
Log:
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.

Modified: branches/lowmem-no-byte/Tremor/Makefile.am
===================================================================
--- branches/lowmem-no-byte/Tremor/Makefile.am	2010-04-20 08:47:26 UTC (rev 17154)
+++ branches/lowmem-no-byte/Tremor/Makefile.am	2010-04-20 08:56:46 UTC (rev 17155)
@@ -2,6 +2,9 @@
 
 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 @@
 
 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

Modified: branches/lowmem-no-byte/Tremor/configure.in
===================================================================
--- branches/lowmem-no-byte/Tremor/configure.in	2010-04-20 08:47:26 UTC (rev 17154)
+++ branches/lowmem-no-byte/Tremor/configure.in	2010-04-20 08:56:46 UTC (rev 17155)
@@ -110,4 +110,4 @@
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile vorbisidec.pc)

Added: branches/lowmem-no-byte/Tremor/vorbisidec.pc.in
===================================================================
--- branches/lowmem-no-byte/Tremor/vorbisidec.pc.in	                        (rev 0)
+++ branches/lowmem-no-byte/Tremor/vorbisidec.pc.in	2010-04-20 08:56:46 UTC (rev 17155)
@@ -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}