[Commit-gnuradio] r11131 - in gnuradio/branches/developers/jcorgan/np: config gr-atsc gr-atsc/src/lib

[jcorgan]

Author: jcorgan
Date: 2009-05-26 14:06:58 -0600 (Tue, 26 May 2009)
New Revision: 11131

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

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_atsc.m4       
2009-05-26 19:44:59 UTC (rev 11130)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_atsc.m4       
2009-05-26 20:06:58 UTC (rev 11131)
@@ -25,6 +25,7 @@
 
     AC_CONFIG_FILES([\
         gr-atsc/Makefile \
+       gr-atsc/gnuradio-atsc.pc \
         gr-atsc/doc/Makefile \
         gr-atsc/src/Makefile \
         gr-atsc/src/lib/Makefile \


Property changes on: gnuradio/branches/developers/jcorgan/np/gr-atsc
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
   + Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
gnuradio-atsc.pc


Modified: gnuradio/branches/developers/jcorgan/np/gr-atsc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-atsc/Makefile.am 2009-05-26 
19:44:59 UTC (rev 11130)
+++ gnuradio/branches/developers/jcorgan/np/gr-atsc/Makefile.am 2009-05-26 
20:06:58 UTC (rev 11131)
@@ -1,5 +1,5 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,4 +25,4 @@
 DIST_SUBDIRS = src doc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
+dist_pkgconfig_DATA = gnuradio-atsc.pc

Added: gnuradio/branches/developers/jcorgan/np/gr-atsc/gnuradio-atsc.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-atsc/gnuradio-atsc.pc.in         
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/np/gr-atsc/gnuradio-atsc.pc.in 
2009-05-26 20:06:58 UTC (rev 11131)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-atsc
+Description: The GNU Radio blocks for ATSC decoding
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-atsc
+Cflags: -I${includedir}

Modified: gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am 
2009-05-26 19:44:59 UTC (rev 11130)
+++ gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am 
2009-05-26 20:06:58 UTC (rev 11131)
@@ -32,13 +32,10 @@
        qa_atsci_viterbi_decoder_t1_input.dat   \
        qa_atsci_viterbi_decoder_t1_output.dat
 
-if PYTHON
-TESTS =                                                \
-       test_atsci
 
-# We build two libtool convenience libraries
+TESTS =        test_atsci
 
-noinst_LTLIBRARIES = libatsc.la libatsc-qa.la
+lib_LTLIBRARIES = libgnuradio-atsc.la
 
 # FIXME
 #      atsci_exp2_lp.cc                        \
@@ -47,7 +44,7 @@
 #      atsci_vsbtx_lp.cc                       \
 #
 
-libatsc_la_SOURCES =                   \
+libgnuradio_atsc_la_SOURCES =                  \
        atsc_derandomizer.cc                    \
        atsc_randomizer.cc                      \
        atsc_rs_decoder.cc                      \
@@ -89,10 +86,12 @@
        create_atsci_fs_correlator.cc           \
        plinfo.cc                               
 
-libatsc_la_LIBADD =                            \
+libgnuradio_atsc_la_LIBADD =                   \
        $(GNURADIO_CORE_LA)
 
-libatsc_qa_la_SOURCES =                        \
+noinst_LTLIBRARIES = libgnuradio-atsc-qa.la
+
+libgnuradio_atsc_qa_la_SOURCES =               \
        qa_atsci_basic_trellis_encoder.cc       \
        qa_atsci_data_interleaver.cc            \
        qa_atsci_equalizer_nop.cc               \
@@ -108,9 +107,10 @@
        qa_atsci.cc                             \
        qa_interleaver_fifo.cc                  
 
-libatsc_qa_la_LIBADD =                         \
+libgnuradio_atsc_qa_la_LIBADD =                        \
        $(GNURADIO_CORE_LA)
 
+
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                            \
        atsc_consts.h                           \
@@ -194,8 +194,8 @@
 
 test_atsci_SOURCES = test_atsci.cc
 test_atsci_LDADD   =           \
-       libatsc-qa.la           \
-       libatsc.la              \
+       libgnuradio-atsc-qa.la  \
+       libgnuradio-atsc.la     \
        $(CPPUNIT_LIBS)
 
 # ------------------------------------------------------------------------
@@ -204,6 +204,7 @@
 
 CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
 
+if PYTHON
 # ------------------------------------------------------------------------
 #  This is the swig-ish part of the Makefile.
 #  It builds the atsc module which we'll load into python
@@ -221,7 +222,7 @@
 
 # additional libraries for linking with the SWIG-generated library
 atsc_la_swig_libadd =          \
-       libatsc.la
+       libgnuradio-atsc.la
 
 include $(top_srcdir)/Makefile.swig