diff options
| author | jcorgan | 2007-02-26 21:26:10 +0000 |
|---|---|---|
| committer | jcorgan | 2007-02-26 21:26:10 +0000 |
| commit | 63d05d64826fd1b3eef89e5a8a14a73b318464ac (patch) | |
| tree | 3d720a44e1088f92769f6a56408202446fbd569f /gr-atsc/src/lib/Makefile.am | |
| parent | 789bfcc9d9172645e7b4bf0c7fbf30574e03c201 (diff) | |
| download | gnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.tar.gz gnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.tar.bz2 gnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.zip | |
Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libtool and already installed libraries.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4646 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-atsc/src/lib/Makefile.am')
| -rw-r--r-- | gr-atsc/src/lib/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index fe21d5ef2..8dcc1c0c3 100644 --- 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++ |