[Commit-gnuradio] r11145 - in gnuradio/branches/developers/jcorgan/np: config gr-pager gr-pager/src

[jcorgan]

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

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

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_pager.m4      
2009-05-26 23:30:05 UTC (rev 11144)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_pager.m4      
2009-05-26 23:40:53 UTC (rev 11145)
@@ -25,6 +25,7 @@
 
     AC_CONFIG_FILES([\
         gr-pager/Makefile \
+       gr-pager/gnuradio-pager.pc \
         gr-pager/src/Makefile \
         gr-pager/src/run_tests
     ])


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

   + Makefile
Makefile.in
data
*.pc


Modified: gnuradio/branches/developers/jcorgan/np/gr-pager/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-pager/Makefile.am        
2009-05-26 23:30:05 UTC (rev 11144)
+++ gnuradio/branches/developers/jcorgan/np/gr-pager/Makefile.am        
2009-05-26 23:40:53 UTC (rev 11145)
@@ -22,3 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-pager.pc

Added: gnuradio/branches/developers/jcorgan/np/gr-pager/gnuradio-pager.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-pager/gnuradio-pager.pc.in       
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/np/gr-pager/gnuradio-pager.pc.in       
2009-05-26 23:40:53 UTC (rev 11145)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks implementing a FLEX pager decoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-pager
+Cflags: -I${includedir}

Modified: gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am    
2009-05-26 23:30:05 UTC (rev 11144)
+++ gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am    
2009-05-26 23:40:53 UTC (rev 11145)
@@ -21,7 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-if PYTHON
 EXTRA_DIST = run_tests.in
 
 TESTS = run_tests
@@ -30,11 +29,6 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-dist_bin_SCRIPTS = \
-       usrp_flex.py \
-       usrp_flex_all.py \
-       usrp_flex_band.py
-
 noinst_PYTHON = \
        qa_pager.py
 
@@ -49,6 +43,31 @@
        pageri_flex_modes.h \
        pageri_util.h
 
+lib_LTLIBRARIES = libgnuradio-pager.la
+
+libgnuradio_pager_la_SOURCES = \
+       pager_flex_frame.cc \
+       pager_slicer_fb.cc \
+       pager_flex_sync.cc \
+       pager_flex_deinterleave.cc \
+       pager_flex_parse.cc \
+       pageri_bch3221.cc \
+       pageri_flex_modes.cc \
+       pageri_util.cc
+
+libgnuradio_pager_la_LIBADD =  \
+       $(GNURADIO_CORE_LA)
+
+libgnuradio_pager_la_LDFLAGS = \
+       $(NO_UNDEFINED)
+
+if PYTHON
+
+dist_bin_SCRIPTS = \
+       usrp_flex.py \
+       usrp_flex_all.py \
+       usrp_flex_band.py
+
 ##############################
 # SWIG interface and library
 
@@ -62,20 +81,9 @@
 pager_swig_pythondir_category = \
        gnuradio/pager
 
-# additional sources for the SWIG-generated library
-pager_swig_la_swig_sources = \
-       pager_flex_frame.cc \
-       pager_slicer_fb.cc \
-       pager_flex_sync.cc \
-       pager_flex_deinterleave.cc \
-       pager_flex_parse.cc \
-       pageri_bch3221.cc \
-       pageri_flex_modes.cc \
-       pageri_util.cc
-
 # additional libraries for linking with the SWIG-generated library
 pager_swig_la_swig_libadd = \
-       $(GNURADIO_CORE_LA)
+       libgnuradio-pager.la
 
 # additional Python files to be installed along with the SWIG-generated one
 pager_swig_python = \