[Commit-gnuradio] r11132 - in gnuradio/branches/developers/jcorgan/np: config debian gr-audio-alsa

[jcorgan]

Author: jcorgan
Date: 2009-05-26 14:15:24 -0600 (Tue, 26 May 2009)
New Revision: 11132

Added:
   
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in
Removed:
   gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gr-audio-alsa.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_alsa.m4
   gnuradio/branches/developers/jcorgan/np/debian/gen-install-files.sh
   gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/Makefile.am
Log:
Fix gr-audio-alsa .pc file name

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_alsa.m4 
2009-05-26 20:06:58 UTC (rev 11131)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_alsa.m4 
2009-05-26 20:15:24 UTC (rev 11132)
@@ -35,7 +35,7 @@
 
     AC_CONFIG_FILES([ \
         gr-audio-alsa/Makefile \
-       gr-audio-alsa/gr-audio-alsa.pc \
+       gr-audio-alsa/gnuradio-audio-alsa.pc \
         gr-audio-alsa/src/Makefile \
         gr-audio-alsa/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/debian/gen-install-files.sh
===================================================================
--- gnuradio/branches/developers/jcorgan/np/debian/gen-install-files.sh 
2009-05-26 20:06:58 UTC (rev 11131)
+++ gnuradio/branches/developers/jcorgan/np/debian/gen-install-files.sh 
2009-05-26 20:15:24 UTC (rev 11132)
@@ -57,7 +57,7 @@
 touch $NAME
 $EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME
 echo usr/lib/libgnuradio-audio-alsa.so >>$NAME
-echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$NAME
+echo usr/lib/pkgconfig/gnuradio-audio-alsa.pc >>$NAME
 
 # libgnuradio-qtgui
 NAME=debian/libgnuradio-qtgui.install

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/Makefile.am   
2009-05-26 20:06:58 UTC (rev 11131)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/Makefile.am   
2009-05-26 20:15:24 UTC (rev 11132)
@@ -21,13 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = \
-    gr-audio-alsa.pc.in
-
 SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gr-audio-alsa.pc
+dist_pkgconfig_DATA = gnuradio-audio-alsa.pc
 
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-alsa.conf

Copied: 
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in 
(from rev 11130, 
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gr-audio-alsa.pc.in)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in 
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in 
    2009-05-26 20:15:24 UTC (rev 11132)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-alsa
+Description: The GNU Radio block for the ALSA sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-alsa
+Cflags: -I${includedir}


Property changes on: 
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/eb/t348/gr-audio-alsa/gr-audio-alsa.pc.in:10638-10648
/gnuradio/branches/developers/eb/t364/gr-audio-alsa/gr-audio-alsa.pc.in:11016-11017
/gnuradio/branches/developers/eb/t367/gr-audio-alsa/gr-audio-alsa.pc.in:11021-11025
/gnuradio/branches/developers/eb/t371/gr-audio-alsa/gr-audio-alsa.pc.in:10958-10971
/gnuradio/branches/developers/eb/t378/gr-audio-alsa/gr-audio-alsa.pc.in:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-audio-alsa/gr-audio-alsa.pc.in:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gr-audio-alsa/gr-audio-alsa.pc.in:10464-10658
/gnuradio/branches/developers/jblum/vlen/gr-audio-alsa/gr-audio-alsa.pc.in:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-audio-alsa/gr-audio-alsa.pc.in:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-audio-alsa/gr-audio-alsa.pc.in:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gr-audio-alsa/gr-audio-alsa.pc.in:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gr-audio-alsa/gr-audio-alsa.pc.in:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-audio-alsa/gr-audio-alsa.pc.in:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gr-audio-alsa/gr-audio-alsa.pc.in:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gr-audio-alsa/gr-audio-alsa.pc.in:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gr-audio-alsa/gr-audio-alsa.pc.in:10540-10546