[Commit-gnuradio] r11142 - in gnuradio/branches/developers/jcorgan/np: config gr-gsm-fr-vocoder gr-gsm-fr-vocoder/src/lib

[jcorgan]

Author: jcorgan
Date: 2009-05-26 17:21:31 -0600 (Tue, 26 May 2009)
New Revision: 11142

Added:
   
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_gsm_fr_vocoder.m4
   gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/Makefile.am
   gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
Log:
Split out C++ API for gr-gsm-fr-vocoder

Modified: 
gnuradio/branches/developers/jcorgan/np/config/grc_gr_gsm_fr_vocoder.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_gsm_fr_vocoder.m4     
2009-05-26 23:12:07 UTC (rev 11141)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_gsm_fr_vocoder.m4     
2009-05-26 23:21:31 UTC (rev 11142)
@@ -25,6 +25,7 @@
 
     AC_CONFIG_FILES([\
         gr-gsm-fr-vocoder/Makefile \
+       gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \
         gr-gsm-fr-vocoder/src/Makefile \
         gr-gsm-fr-vocoder/src/lib/Makefile \
         gr-gsm-fr-vocoder/src/lib/gsm/Makefile \

Modified: gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/Makefile.am       
2009-05-26 23:12:07 UTC (rev 11141)
+++ gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/Makefile.am       
2009-05-26 23:21:31 UTC (rev 11142)
@@ -1,5 +1,5 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,4 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
-DIST_SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc

Added: 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
     2009-05-26 23:21:31 UTC (rev 11142)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks implementing a GSM full rate vocoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder
+Cflags: -I${includedir}

Modified: 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am   
    2009-05-26 23:12:07 UTC (rev 11141)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am   
    2009-05-26 23:21:31 UTC (rev 11142)
@@ -25,14 +25,26 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-if PYTHON
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        gsm_fr_decode_ps.h              \
        gsm_fr_encode_sp.h
 
+lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
+
+libgnuradio_gsm_fr_vocoder_la_SOURCES = \
+       gsm_fr_decode_ps.cc             \
+       gsm_fr_encode_sp.cc
+
+libgnuradio_gsm_fr_vocoder_la_LIBADD = \
+       $(GNURADIO_CORE_LA)             \
+       gsm/libgsm.la
+
+libgnuradio_gsm_fr_vocoder_la_LDFLAGS =        \
+       $(NO_UNDEFINED)
+
+if PYTHON
 # SWIG interface and library
-
 TOP_SWIG_IFILES =                      \
        gsm_full_rate.i
 
@@ -43,15 +55,9 @@
 gsm_full_rate_pythondir_category =     \
        gnuradio/vocoder
 
-# additional sources for the SWIG-generated library
-gsm_full_rate_la_swig_sources =        \
-       gsm_fr_decode_ps.cc             \
-       gsm_fr_encode_sp.cc
-
 # additional libraries for linking with the SWIG-generated library
 gsm_full_rate_la_swig_libadd =         \
-       $(GNURADIO_CORE_LA)             \
-       gsm/libgsm.la
+       libgnuradio-gsm-fr-vocoder.la
 
 include $(top_srcdir)/Makefile.swig