[Commit-gnuradio] r11140 - in gnuradio/branches/developers/jcorgan/np: config gr-cvsd-vocoder gr-cvsd-vocoder/src/lib

[jcorgan]

Author: jcorgan
Date: 2009-05-26 17:07:24 -0600 (Tue, 26 May 2009)
New Revision: 11140

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

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_cvsd_vocoder.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_cvsd_vocoder.m4       
2009-05-26 22:54:15 UTC (rev 11139)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_cvsd_vocoder.m4       
2009-05-26 23:07:24 UTC (rev 11140)
@@ -25,6 +25,7 @@
 
     AC_CONFIG_FILES([\
         gr-cvsd-vocoder/Makefile \
+       gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \
         gr-cvsd-vocoder/src/Makefile \
         gr-cvsd-vocoder/src/lib/Makefile \
         gr-cvsd-vocoder/src/python/Makefile \


Property changes on: gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in


   + Makefile
Makefile.in
*.pc



Modified: gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/Makefile.am 
2009-05-26 22:54:15 UTC (rev 11139)
+++ gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/Makefile.am 
2009-05-26 23:07:24 UTC (rev 11140)
@@ -22,4 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
-DIST_SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc

Added: 
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
                         (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
 2009-05-26 23:07:24 UTC (rev 11140)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-cvsd-vocoder
+Description: GNU Radio blocks implementing a CVSD vocoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-cvsd-vocoder
+Cflags: -I${includedir}

Modified: 
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am 
2009-05-26 22:54:15 UTC (rev 11139)
+++ gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am 
2009-05-26 23:07:24 UTC (rev 11140)
@@ -23,12 +23,24 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-if PYTHON
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        cvsd_decode_bs.h                \
        cvsd_encode_sb.h
 
+lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la
+
+libgnuradio_cvsd_vocoder_la_SOURCES =  \
+       cvsd_decode_bs.cc               \
+       cvsd_encode_sb.cc
+
+libgnuradio_cvsd_vocoder_la_LIBADD =   \
+       $(GNURADIO_CORE_LA)
+
+libgnuradio_cvsd_vocoder_la_LDFLAGS =  \
+       $(NO_UNDEFINED)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
 
@@ -42,14 +54,9 @@
 cvsd_vocoder_pythondir_category =      \
        gnuradio/vocoder
 
-# additional sources for the SWIG-generated library
-cvsd_vocoder_la_swig_sources =         \
-       cvsd_decode_bs.cc               \
-       cvsd_encode_sb.cc
-
 # additional libraries for linking with the SWIG-generated library
 cvsd_vocoder_la_swig_libadd =          \
-       $(GNURADIO_CORE_LA)
+       libgnuradio-cvsd-vocoder.la
 
 include $(top_srcdir)/Makefile.swig