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

[jcorgan]

Author: jcorgan
Date: 2009-05-26 14:53:45 -0600 (Tue, 26 May 2009)
New Revision: 11135

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

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_oss.m4  
2009-05-26 20:32:27 UTC (rev 11134)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_oss.m4  
2009-05-26 20:53:45 UTC (rev 11135)
@@ -51,6 +51,7 @@
 
     AC_CONFIG_FILES([ \
         gr-audio-oss/Makefile \
+       gr-audio-oss/gnuradio-audio-oss.pc \
         gr-audio-oss/src/Makefile \
         gr-audio-oss/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-oss/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-oss/Makefile.am    
2009-05-26 20:32:27 UTC (rev 11134)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-oss/Makefile.am    
2009-05-26 20:53:45 UTC (rev 11135)
@@ -23,5 +23,8 @@
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-oss.pc
+
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-oss.conf

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

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am        
2009-05-26 20:32:27 UTC (rev 11134)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am        
2009-05-26 20:53:45 UTC (rev 11135)
@@ -21,9 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+
 EXTRA_DIST = run_tests.in
 
-if PYTHON
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =            \
        audio_oss_sink.h        \
@@ -31,8 +32,20 @@
 
 noinst_PYTHON = qa_oss.py
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+lib_LTLIBRARIES = libgnuradio-audio-oss.la
 
+libgnuradio_audio_oss_la_SOURCES =     \
+       audio_oss_sink.cc               \
+       audio_oss_source.cc
+
+libgnuradio_audio_oss_la_LIBADD =      \
+       $(GNURADIO_CORE_LA)             \
+       $(OSS_LIBS)
+
+libgnuradio_audio_oss_la_LDFLAGS =     \
+       $(NO_UNDEFINED)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
 TESTS = run_tests
@@ -48,15 +61,9 @@
 audio_oss_pythondir_category = \
        gnuradio
 
-# additional sources for the SWIG-generated library
-audio_oss_la_swig_sources =    \
-       audio_oss_sink.cc       \
-       audio_oss_source.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_oss_la_swig_libadd =     \
-       $(GNURADIO_CORE_LA)     \
-       $(OSS_LIBS)
+       libgnuradio-audio-oss.la
 
 include $(top_srcdir)/Makefile.swig