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

[jcorgan]

Author: jcorgan
Date: 2009-05-26 14:31:10 -0600 (Tue, 26 May 2009)
New Revision: 11133

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

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_jack.m4 
2009-05-26 20:15:24 UTC (rev 11132)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_audio_jack.m4 
2009-05-26 20:31:10 UTC (rev 11133)
@@ -35,6 +35,7 @@
 
     AC_CONFIG_FILES([ \
         gr-audio-jack/Makefile \
+       gr-audio-jack/gnuradio-audio-jack.pc \
         gr-audio-jack/src/Makefile \
         gr-audio-jack/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-jack/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-jack/Makefile.am   
2009-05-26 20:15:24 UTC (rev 11132)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-jack/Makefile.am   
2009-05-26 20:31:10 UTC (rev 11133)
@@ -23,5 +23,8 @@
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-jack.pc
+
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-jack.conf

Added: 
gnuradio/branches/developers/jcorgan/np/gr-audio-jack/gnuradio-audio-jack.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-audio-jack/gnuradio-audio-jack.pc.in 
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-audio-jack/gnuradio-audio-jack.pc.in 
    2009-05-26 20:31:10 UTC (rev 11133)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-alsa
+Description: GNU Radio blocks for the JACK sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-jack
+Cflags: -I${includedir}

Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am       
2009-05-26 20:15:24 UTC (rev 11132)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am       
2009-05-26 20:31:10 UTC (rev 11133)
@@ -23,7 +23,6 @@
 
 EXTRA_DIST = run_tests.in
 
-if PYTHON
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        audio_jack_sink.h               \
@@ -32,11 +31,26 @@
 noinst_HEADERS =                       \
        gri_jack.h
 
+lib_LTLIBRARIES = libgnuradio-audio-jack.la
+
+libgnuradio_audio_jack_la_SOURCES =    \
+       audio_jack_sink.cc              \
+       audio_jack_source.cc            \
+       gri_jack.cc
+
+libgnuradio_audio_jack_la_LIBADD =     \
+       $(GNURADIO_CORE_LA)             \
+       $(JACK_LIBS)
+
+libgnuradio_audio_jack_la_LDFLAGS =    \
+       $(NO_UNDEFINED)
+
 noinst_PYTHON =                        \
        qa_jack.py
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
+if PYTHON
 ###################################
 # SWIG Python interface and library
 TESTS = run_tests
@@ -52,16 +66,9 @@
 audio_jack_pythondir_category =                \
        gnuradio
 
-# additional sources for the SWIG-generated library
-audio_jack_la_swig_sources =           \
-       audio_jack_sink.cc              \
-       audio_jack_source.cc            \
-       gri_jack.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_jack_la_swig_libadd =            \
-       $(GNURADIO_CORE_LA)             \
-       $(JACK_LIBS)
+       libgnuradio-audio-jack.la
 
 include $(top_srcdir)/Makefile.swig