[xiph-commits] r17289 - trunk/cdparanoia

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-06-11 08:42:00 -0700 (Fri, 11 Jun 2010)
New Revision: 17289

Added:
   trunk/cdparanoia/cdparanoia-3.pc.in
Modified:
   trunk/cdparanoia/Makefile.in
   trunk/cdparanoia/configure.in
Log:
Add pkgconfig file to cdparanoia; closes Trac #1706


Modified: trunk/cdparanoia/Makefile.in
===================================================================
--- trunk/cdparanoia/Makefile.in	2010-06-11 15:30:39 UTC (rev 17288)
+++ trunk/cdparanoia/Makefile.in	2010-06-11 15:42:00 UTC (rev 17289)
@@ -3,7 +3,7 @@
 # DO NOT EDIT BELOW! ##########################################################
 # (unless, of course, you know what you are doing :) ##########################
 
-VERSION=10.2
+VERSION=@VERSION@
 VPATH=@srcdir@
 srcdir=@srcdir@
 
@@ -23,6 +23,7 @@
 MANDIR=@mandir@
 INCLUDEDIR=@includedir@
 LIBDIR=@libdir@
+PKGCONFIGDIR=@libdir@/pkgconfig
 PWD = $(shell pwd)
 
 OFILES = main.o report.o header.o buffering_write.o cachetest.o
@@ -85,6 +86,8 @@
 		$(LIBDIR)/libcdda_paranoia.so.0
 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
 		$(LIBDIR)/libcdda_paranoia.so
+	$(INSTALL) -d -m 0755 $(PKGCONFIGDIR) 
+	$(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(PKGCONFIGDIR) 
 
 cdparanoia:	$(OFILES) $(LIBDEP)
 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
@@ -104,6 +107,6 @@
 	cd interface && $(MAKE) distclean
 	cd paranoia && $(MAKE) distclean
 	-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
-		Makefile verify_test core gmon.out
+		Makefile verify_test core gmon.out cdparanoia-3.pc
 
 .PHONY: all debug test lib slib install clean distclean

Added: trunk/cdparanoia/cdparanoia-3.pc.in
===================================================================
--- trunk/cdparanoia/cdparanoia-3.pc.in	                        (rev 0)
+++ trunk/cdparanoia/cdparanoia-3.pc.in	2010-06-11 15:42:00 UTC (rev 17289)
@@ -0,0 +1,12 @@
+prefix=@prefix@ 
+exec_prefix=@exec_prefix@ 
+libdir=@libdir@ 
+includedir=@includedir@ 
+
+Name: Cdparanoia III 
+Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library 
+Requires: 
+Version: @VERSION@ 
+Libs: -L${libdir} -lcdda_interface -lcdda_paranoia 
+Cflags: -I${includedir} 
+

Modified: trunk/cdparanoia/configure.in
===================================================================
--- trunk/cdparanoia/configure.in	2010-06-11 15:30:39 UTC (rev 17288)
+++ trunk/cdparanoia/configure.in	2010-06-11 15:42:00 UTC (rev 17289)
@@ -1,5 +1,8 @@
 AC_INIT(interface/interface.c)
 
+VERSION="10.3pre" 
+AC_SUBST(VERSION) 
+
 cp $srcdir/configure.guess $srcdir/config.guess
 cp $srcdir/configure.sub $srcdir/config.sub
 
@@ -67,4 +70,4 @@
 AC_SUBST(DEBUG)
 AC_SUBST(CC)
 
-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
+AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)