[xiph-commits] r17154 - branches/lowmem-branch/Tremor

[conrad at svn.xiph.org]

Author: conrad
Date: 2010-04-20 01:47:26 -0700 (Tue, 20 Apr 2010)
New Revision: 17154

Added:
   branches/lowmem-branch/Tremor/vorbisidec.pc.in
Modified:
   branches/lowmem-branch/Tremor/Makefile.am
   branches/lowmem-branch/Tremor/configure.in
Log:
Merge r17150,r17151,r17152 from trunk/Tremor

Add a pkgconfig file, include html docs in dist. NB. this branch has
no Win32 directory.
Adapted from patch by Stefan Kost.

Modified: branches/lowmem-branch/Tremor/Makefile.am
===================================================================
--- branches/lowmem-branch/Tremor/Makefile.am	2010-04-20 08:47:06 UTC (rev 17153)
+++ branches/lowmem-branch/Tremor/Makefile.am	2010-04-20 08:47:26 UTC (rev 17154)
@@ -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,9 @@
 
 include_HEADERS = ivorbiscodec.h ivorbisfile.h ogg.h os_types.h config_types.h
 
+EXTRA_DIST = vorbisidec.pc.in \
+        $(srcdir)/doc/*.html
+
 example:
 	-ln -fs . vorbis
 	$(MAKE) ivorbisfile_example

Modified: branches/lowmem-branch/Tremor/configure.in
===================================================================
--- branches/lowmem-branch/Tremor/configure.in	2010-04-20 08:47:06 UTC (rev 17153)
+++ branches/lowmem-branch/Tremor/configure.in	2010-04-20 08:47:26 UTC (rev 17154)
@@ -134,4 +134,4 @@
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 
-AC_OUTPUT(Makefile Version_script)
+AC_OUTPUT(Makefile Version_script vorbisidec.pc)

Added: branches/lowmem-branch/Tremor/vorbisidec.pc.in
===================================================================
--- branches/lowmem-branch/Tremor/vorbisidec.pc.in	                        (rev 0)
+++ branches/lowmem-branch/Tremor/vorbisidec.pc.in	2010-04-20 08:47:26 UTC (rev 17154)
@@ -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}