[Commit-gnuradio] r11137 - in gnuradio/branches/developers/jcorgan/np: config gr-audio-portaudio gr-audio-portaudio/src

[jcorgan]

Author: jcorgan
Date: 2009-05-26 15:17:53 -0600 (Tue, 26 May 2009)
New Revision: 11137

Added:
   
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_portaudio.m4
   gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/Makefile.am
   gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
Log:
Split out C++ API library for gr-audio-portaudio

Modified: 
gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_portaudio.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_portaudio.m4    
2009-05-26 21:03:59 UTC (rev 11136)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_portaudio.m4    
2009-05-26 21:17:53 UTC (rev 11137)
@@ -35,6 +35,7 @@
 
     AC_CONFIG_FILES([ \
         gr-audio-portaudio/Makefile \
+       gr-audio-portaudio/gnuradio-audio-portaudio.pc \
         gr-audio-portaudio/src/Makefile \
         gr-audio-portaudio/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/Makefile.am      
2009-05-26 21:03:59 UTC (rev 11136)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/Makefile.am      
2009-05-26 21:17:53 UTC (rev 11137)
@@ -23,5 +23,8 @@
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc
+
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-portaudio.conf

Added: 
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
                           (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
   2009-05-26 21:17:53 UTC (rev 11137)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-portaudio
+Description: The GNU Radio block for the PORTAUDIO sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-portaudio
+Cflags: -I${includedir}

Modified: 
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am  
2009-05-26 21:03:59 UTC (rev 11136)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am  
2009-05-26 21:17:53 UTC (rev 11137)
@@ -23,7 +23,6 @@
 
 EXTRA_DIST = run_tests.in
 
-if PYTHON
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
@@ -38,6 +37,22 @@
 noinst_PYTHON =                        \
        qa_portaudio.py
 
+lib_LTLIBRARIES = libgnuradio-audio-portaudio.la
+
+libgnuradio_audio_portaudio_la_SOURCES = \
+       audio_portaudio_sink.cc         \
+       audio_portaudio_source.cc       \
+       gri_portaudio.cc
+
+libgnuradio_audio_portaudio_la_LIBADD =        \
+       $(GNURADIO_CORE_LA)             \
+       $(PORTAUDIO_LIBS)
+
+libgnuradio_audio_portaudio_la_LDFLAGS = \
+       $(NO_UNDEFINED)
+
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
 TESTS = run_tests
@@ -53,16 +68,9 @@
 audio_portaudio_pythondir_category =   \
        gnuradio
 
-# additional sources for the SWIG-generated library
-audio_portaudio_la_swig_sources =      \
-       audio_portaudio_sink.cc         \
-       audio_portaudio_source.cc       \
-       gri_portaudio.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_portaudio_la_swig_libadd =       \
-       $(GNURADIO_CORE_LA)             \
-       $(PORTAUDIO_LIBS)
+       libgnuradio-audio-portaudio.la
 
 include $(top_srcdir)/Makefile.swig