[xiph-cvs] cvs commit: vorbis vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in Makefile.am configure.in

[Chris Cheney]

calc        03/09/11 16:42:26

  Modified:    .        Makefile.am configure.in
  Added:       .        vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in
  Log:
  add pkg-config support for vorbis

Revision  Changes    Path
1.15      +5 -2      vorbis/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am	18 Sep 2002 11:56:01 -0000	1.14
+++ Makefile.am	11 Sep 2003 20:42:26 -0000	1.15
@@ -7,8 +7,11 @@
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
 
-EXTRA_DIST = HACKING todo.txt macos macosx \
-	autogen.sh libvorbis.spec vorbis.m4
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
+
+EXTRA_DIST = HACKING todo.txt macos macosx autogen.sh libvorbis.spec \
+	vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in
 
 dist-hook:
         rm -rf `find $(distdir)/macos -name CVS`

<p><p>1.70      +1 -1      vorbis/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure.in	3 Sep 2003 03:57:50 -0000	1.69
+++ configure.in	11 Sep 2003 20:42:26 -0000	1.70
@@ -204,4 +204,4 @@
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile vorbis.pc vorbisenc.pc vorbisfile.pc)

<p><p>1.1                  vorbis/vorbis.pc.in

Index: vorbis.pc.in
===================================================================
# libvorbis pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: vorbis
Description: vorbis is the primary Ogg Vorbis library
Version: @VERSION@
Requires: ogg
Conflicts:
Libs: -L${libdir} -lvorbis -lm
Cflags: -I${includedir}

<p><p>1.1                  vorbis/vorbisenc.pc.in

Index: vorbisenc.pc.in
===================================================================
# libvorbisenc pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: vorbisenc
Description: vorbisenc is a library that provides a convenient API for setting up an encoding environment using libvorbis
Version: @VERSION@
Requires: vorbis
Conflicts:
Libs: -L${libdir} -lvorbisenc
Cflags: -I${includedir}

<p><p>1.1                  vorbis/vorbisfile.pc.in

Index: vorbisfile.pc.in
===================================================================
# libvorbisfile pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: vorbisfile
Description: vorbisfile is a library that provides a convenient high-level API for decoding and basic manipulation of all Vorbis I audio streams
Version: @VERSION@
Requires: vorbis
Conflicts:
Libs: -L${libdir} -lvorbisfile
Cflags: -I${includedir}

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.