Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libto...

[debian/gnuradio] / gr-atsc / src / lib / Makefile.am

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index fe21d5ef2a8dadc6776533dcf7750ff101498c10..8dcc1c0c3762b1c92b259e1af5b42d33695a9038 100644 (file)
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -30,8 +30,6 @@ ourlibdir    = $(grpyexecdir)
 
 INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(CPPUNIT_INCLUDES)
 
-#LIBS += $(GNURADIO_CORE_LIBS)
-
 EXTRA_DIST =                                   \
        gen_encoder.py                          \
        qa_atsci_trellis_encoder_t1_input.dat   \
@@ -204,8 +202,11 @@ atsci_viterbi_mux.cc: atsci_viterbi_gen$(EXEEXT)
 
 
 test_atsci_SOURCES = test_atsci.cc
-test_atsci_LDADD   = libatsc-qa.la libatsc.la $(GNURADIO_CORE_LIBS) $(CPPUNIT_LIBS)
-
+test_atsci_LDADD   =           \
+       libatsc-qa.la           \
+       libatsc.la              \
+       $(GNURADIO_CORE_LA)     \
+       $(CPPUNIT_LIBS)
 
 # ------------------------------------------------------------------------
 #  This is the swig-ish part of the Makefile.
@@ -249,7 +250,7 @@ _atsc_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 # link the library against some comon swig runtime code and the 
 # c++ standard library
 _atsc_la_LIBADD =                      \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(PYTHON_LDFLAGS)               \
        libatsc.la                      \
        -lstdc++