[Commit-gnuradio] r11149 - in gnuradio/branches/developers/jcorgan/np: config gr-audio-osx gr-comedi/src omnithread usrp2/host

[jcorgan]

Author: jcorgan
Date: 2009-05-26 19:33:30 -0600 (Tue, 26 May 2009)
New Revision: 11149

Added:
   gnuradio/branches/developers/jcorgan/np/gr-audio-osx/gnuradio-audio-osx.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_osx.m4
   gnuradio/branches/developers/jcorgan/np/gr-audio-osx/Makefile.am
   gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
   gnuradio/branches/developers/jcorgan/np/omnithread/gnuradio-omnithread.pc.in
   gnuradio/branches/developers/jcorgan/np/usrp2/host/usrp2.pc.in
Log:
Cleanup, passes distcheck

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_osx.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_osx.m4  
2009-05-27 00:44:03 UTC (rev 11148)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_osx.m4  
2009-05-27 01:33:30 UTC (rev 11149)
@@ -43,6 +43,7 @@
 
     AC_CONFIG_FILES([ \
         gr-audio-osx/Makefile \
+       gr-audio-osx/gnuradio-audio-osx.pc \
         gr-audio-osx/src/Makefile \
         gr-audio-osx/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-osx/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-osx/Makefile.am    
2009-05-27 00:44:03 UTC (rev 11148)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-osx/Makefile.am    
2009-05-27 01:33:30 UTC (rev 11149)
@@ -22,4 +22,8 @@
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = README_OSX
+
 SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-osx.pc

Added: 
gnuradio/branches/developers/jcorgan/np/gr-audio-osx/gnuradio-audio-osx.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-audio-osx/gnuradio-audio-osx.pc.in   
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-audio-osx/gnuradio-audio-osx.pc.in   
    2009-05-27 01:33:30 UTC (rev 11149)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the OSX audio system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-osx
+Cflags: -I${includedir}

Modified: gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am   
2009-05-27 00:44:03 UTC (rev 11148)
+++ gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am   
2009-05-27 01:33:30 UTC (rev 11149)
@@ -39,8 +39,8 @@
 lib_LTLIBRARIES = libgnuradio-comedi.la
 
 libgnuradio_comedi_la_SOURCES = \
-       comedi_sink.cc          \
-       comedi_source.cc        \
+       comedi_sink_s.cc        \
+       comedi_source_s.cc      \
        gri_comedi.cc
 
 libgnuradio_comedi_la_LIBADD = \

Modified: 
gnuradio/branches/developers/jcorgan/np/omnithread/gnuradio-omnithread.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/omnithread/gnuradio-omnithread.pc.in    
    2009-05-27 00:44:03 UTC (rev 11148)
+++ 
gnuradio/branches/developers/jcorgan/np/omnithread/gnuradio-omnithread.pc.in    
    2009-05-27 01:33:30 UTC (rev 11149)
@@ -8,4 +8,4 @@
 Requires:
 Version: @VERSION@
 Libs: -L${libdir} -lgromnithread
-Cflags: -I${includedir}
+Cflags: @DEFINES@ @PTHREAD_CFLAGS@ -I{includedir}

Modified: gnuradio/branches/developers/jcorgan/np/usrp2/host/usrp2.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/usrp2/host/usrp2.pc.in      
2009-05-27 00:44:03 UTC (rev 11148)
+++ gnuradio/branches/developers/jcorgan/np/usrp2/host/usrp2.pc.in      
2009-05-27 01:33:30 UTC (rev 11149)
@@ -8,4 +8,4 @@
 Requires: gnuradio-omnithread gruel
 Version: @VERSION@
 Libs: -L${libdir} -lusrp2
-Cflags: -I${includedir} @DEFINES@
+Cflags: -I${includedir}