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

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4646 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index 11bc65abce009558160f67a1fde33f04c0cbe7ed..fe026b227b9e0831a5151b4de8516257bac71983 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -54,31 +54,24 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
                    -I$(top_builddir)/gnuradio-core/src/lib/swig \
                    $(FFTW3F_CFLAGS)
 
-# How to link in the top-level omnithreads library
+# How to link in the top-level omnithreads library from inside the tree
 OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
-OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
+OMNITHREAD_LA = $(top_builddir)/omnithread/libgromnithread.la
 
-# How to link in GNU Radio core library
-# Note: Win32 libtool cannot extract DLL dependencies already stored in
-# libgnuradio-core, so the core's dependencies must be repeated here
-# This is redundant but harmless on non-Win32 platforms
-GNURADIO_CORE_LIBS = $(OMNITHREAD_LIBS)                                \
-                    $(FFTW3F_LIBS)                             \
-                    -L$(top_builddir)/gnuradio-core/src/lib    \
-                     -lgnuradio-core
+# How to link in GNU Radio core library from inside the tree
+GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
 
 # This is a dependency for many swig operations
 GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
 
-# The below used to be set in PKGCONFIG but now point to the current
-# build tree.
+# How to link in the USRP library from inside the tree
 USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
                -I$(top_srcdir)/usrp/firmware/include
+USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
 
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib -lusrp
-
+# How to link the PMT library from inside the tree
 PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
-PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la
 
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.

diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 70a4de08ec061a6998cf73b399962e3257146745..171c85edda8b3b104987f18c86e81442b30ba403 100644 (file)
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -36,7 +36,6 @@ libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
 libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
                                 $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
 libgnuradio_core_la_LIBADD  =          \
        filter/libfilter.la             \
        g72x/libccitt.la                \
@@ -46,7 +45,7 @@ libgnuradio_core_la_LIBADD  =                 \
        missing/libmissing.la           \
        reed-solomon/librs.la           \
        runtime/libruntime.la           \
-       $(OMNITHREAD_LIBS)              \
+       $(OMNITHREAD_LA)                \
        $(FFTW3F_LIBS)
 
 libgnuradio_core_qa_la_LIBADD  =       \

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index f0d1615143960afe05d77361b0ead6746a64f75a..2a770a3fbd7c38f290848313ac3bfbdbb46f010a 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -118,8 +118,7 @@ _gnuradio_swig_py_runtime_la_SOURCES =              \
 
 
 _gnuradio_swig_py_runtime_la_LIBADD  =                 \
-       $(GNURADIO_CORE_LIBS)                   \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
+       $(GNURADIO_CORE_LA)                     \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
 
@@ -150,8 +149,7 @@ _gnuradio_swig_py_general_la_SOURCES =              \
 
 
 _gnuradio_swig_py_general_la_LIBADD  =                 \
-       $(GNURADIO_CORE_LIBS)                   \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
+       $(GNURADIO_CORE_LA)                     \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
 
@@ -182,8 +180,7 @@ _gnuradio_swig_py_gengen_la_SOURCES =               \
 
 
 _gnuradio_swig_py_gengen_la_LIBADD  =          \
-       $(GNURADIO_CORE_LIBS)                   \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
+       $(GNURADIO_CORE_LA)                     \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
 
@@ -214,8 +211,7 @@ _gnuradio_swig_py_filter_la_SOURCES =               \
 
 
 _gnuradio_swig_py_filter_la_LIBADD  =          \
-       $(GNURADIO_CORE_LIBS)                   \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
+       $(GNURADIO_CORE_LA)                     \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
 
@@ -246,8 +242,7 @@ _gnuradio_swig_py_io_la_SOURCES =           \
 
 
 _gnuradio_swig_py_io_la_LIBADD  =              \
-       $(GNURADIO_CORE_LIBS)                   \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
+       $(GNURADIO_CORE_LA)                     \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
 

diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am
index f347c1874d4b66b8a67dfd37b24f155af280c5fe..aed3fea9ae158d17c49d0faa2e0c63668c7a38d5 100644 (file)
--- a/gnuradio-core/src/tests/Makefile.am
+++ b/gnuradio-core/src/tests/Makefile.am
@@ -33,7 +33,7 @@ TESTS = test_all
 #Test program to test setting up buffers using gr_test which can be run manually
 EXTRA_DIST =                           \
        test_buffers.py
-       
+
 noinst_PROGRAMS                =       \
        benchmark_dotprod       \
        benchmark_dotprod_fsf   \
@@ -50,7 +50,7 @@ noinst_PROGRAMS               =       \
        test_vmcircbuf
 
 
-LIBGNURADIO =  $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+LIBGNURADIO =  $(GNURADIO_CORE_LA)
 LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO)
 
 benchmark_dotprod_SOURCES = benchmark_dotprod.cc

diff --git a/gnuradio-examples/c++/dial_tone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am
index 7bc8c504b562b069f8ac7f4ced2213a17a04f681..9c6f0e5b6dbaeb177209a754af110fba6cb011f8 100644 (file)
--- a/gnuradio-examples/c++/dial_tone/Makefile.am
+++ b/gnuradio-examples/c++/dial_tone/Makefile.am
@@ -25,12 +25,9 @@ include $(top_srcdir)/Makefile.common
 INCLUDES=$(STD_DEFINES_AND_INCLUDES) \
          -I$(top_srcdir)/gr-audio-alsa/src 
 
-GR_AUDIO_ALSA_LIBS=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
+GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
 
-# For compiling outside the tree, these are the usual
-# INCLUDES = -I/usr/local/include -I/usr/local/include/gnuradio
-# GNURADIO_CORE_LIBS = -lgnuradio-core
-# GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
+# For compiling outside the tree, these will get fished out by pkgconfig
 
 noinst_PROGRAMS = dial_tone
     
@@ -42,7 +39,7 @@ dial_tone_SOURCES = \
     main.cc
 
 dial_tone_LDADD = \
-    $(GNURADIO_CORE_LIBS) \
+    $(GNURADIO_CORE_LA) \
     $(GR_AUDIO_ALSA_LIBS)
 
 MOSTLYCLEANFILES = *~

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++                        

diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index f9b69c78fe5a753b02c02ca7eca9dad4cddfff79..52b2a2d504f683389a39fdc6bec216b8fb555d6f 100644 (file)
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -78,7 +78,7 @@ swiginclude_HEADERS =                         \
 
 _audio_alsa_la_LIBADD =                \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(ALSA_LIBS)                    \
        libgr_audio_alsa.la             \
        -lstdc++                                

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 690788707a50c20988b4168d02715e1a0926d1ad..bed67ac35ecb751b262991fd3d24d7179ff23265 100644 (file)
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -76,7 +76,7 @@ swiginclude_HEADERS =                         \
 
 _audio_jack_la_LIBADD =                \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(JACK_LIBS)                    \
        -lstdc++                                
 

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 2fc0bae26356b9d14e03042fa78ed31d0d4d93b5..aebad3f427e3df9b3b997a7516804df0fed5e5ab 100644 (file)
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -69,7 +69,7 @@ swiginclude_HEADERS =                         \
 
 _audio_oss_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(OSS_LIBS)                     \
        -lstdc++                                
 

diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index 750dd973036e86884cf03ab1135820aaf10739dd..de06c507558de9f452df8e92eea19584bfa5bc79 100644 (file)
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -73,7 +73,7 @@ swiginclude_HEADERS =                         \
 
 _audio_osx_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        -lstdc++                                
 
 _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework AudioUnit -framework CoreAudio -framework AudioToolbox

diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index 63ba7d657a26c6aa4163deff3e0514df1b7d1219..6a7d2d8fb9ac55cb540db6ec31a55e3a93586f54 100644 (file)
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -75,7 +75,7 @@ swiginclude_HEADERS =                         \
 
 _audio_portaudio_la_LIBADD =           \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(PORTAUDIO_LIBS)               \
        -lstdc++                                
 

diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 2de14d5dbd4f15e281ceee57a6f1b52c45e6d86b..36deea362ef3447b123d8135335e71e80df229df 100644 (file)
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -69,7 +69,7 @@ swiginclude_HEADERS =                         \
 
 _audio_windows_la_LIBADD =             \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        $(WINAUDIO_LIBS)                \
        -lstdc++                                
 

diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index b0a537ced890453c59ff226d8abaae821cf2713a..00d008674f18502eb0c659c11dc64fe31451200d 100644 (file)
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -75,7 +75,7 @@ swiginclude_HEADERS =                 \
 
 _comedi_la_LIBADD =            \
        $(PYTHON_LDFLAGS)       \
-       $(GNURADIO_CORE_LIBS)   \
+       $(GNURADIO_CORE_LA)     \
        $(COMEDI_LIBS)          \
        -lstdc++                                
 

diff --git a/gr-ezdop/src/lib/Makefile.am b/gr-ezdop/src/lib/Makefile.am
index c0cdacca6ef2cd2331f898f2f50f8c5b35e07bba..51d7e56c267aae05cb7ea070feec9128a7fdca8d 100644 (file)
--- a/gr-ezdop/src/lib/Makefile.am
+++ b/gr-ezdop/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,7 +32,7 @@ EZDOP_INCLUDES = \
     -I$(top_srcdir)/ezdop/src/firmware \
     -I$(top_srcdir)/ezdop/src/host/ezdop
 
-EZDOP_LIBS = -L$(top_builddir)/ezdop/src/host/ezdop/ -lezdop
+EZDOP_LA = $(top_builddir)/ezdop/src/host/ezdop/libezdop.la
 
 INCLUDES = \
     $(STD_DEFINES_AND_INCLUDES) \
@@ -78,8 +78,8 @@ _ezdop_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 # c++ standard library
 _ezdop_la_LIBADD =                     \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
-       $(EZDOP_LIBS)                   \
+       $(GNURADIO_CORE_LA)             \
+       $(EZDOP_LA)                     \
        -lstdc++                        
 
 ezdop.cc ezdop.py: $(ALL_IFILES)
@@ -89,7 +89,6 @@ ezdop.cc ezdop.py: $(ALL_IFILES)
 grinclude_HEADERS =                    \
        ezdop_source_c.h
 
-
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS =                  \
        $(LOCAL_IFILES)

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 90159dc96986dbe94eff31c82910f75696e7303c..82078779c5fd100dfc7a164c032c0b2c048f6398 100644 (file)
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -76,7 +76,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 _gsm_full_rate_la_LIBADD =     \
        gsm/libgsm.la           \
        $(PYTHON_LDFLAGS)       \
-       $(GNURADIO_CORE_LIBS)   \
+       $(GNURADIO_CORE_LA)     \
        -lstdc++                        
 
 gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)

diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am
index b82e34dca163c09c68d87829773135942a59500d..b818be0e3471e837938c3aaffbdecb91431336a1 100644 (file)
--- a/gr-pager/src/Makefile.am
+++ b/gr-pager/src/Makefile.am
@@ -93,7 +93,7 @@ _pager_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 # link the library against the c++ standard library
 _pager_swig_la_LIBADD = \
     $(PYTHON_LDFLAGS) \
-    $(GNURADIO_CORE_LIBS) \
+    $(GNURADIO_CORE_LA) \
     -lstdc++                   
 
 pager_swig.cc pager_swig.py: $(ALL_IFILES)

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 2f98dd5d0f86dba1d5b997619c7dbfd474a074b1..8adcd591bf1d054f071cb5d65e8dc05bb3d965d8 100644 (file)
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -43,18 +43,23 @@ include_HEADERS =
 noinst_PROGRAMS =                      \
        qt_examples     
 
-qt_examples_MOC =                      \
+BUILT_SOURCES =                        \
        moc_fftdisplay.cc
 
+nodist_qt_examples_SOURCES =           \
+       $(BUILT_SOURCES)
+       
 qt_examples_SOURCES =                  \
        fftdisplay.cc                   \
-       qt_examples.cc                  \
-       $(qt_examples_MOC)
+       qt_examples.cc
 
-qt_examples_LDADD = $(QWT_LIBS) $(QT_LIBS)
-qt_examples_LDFLAGS = $(QT_CFLAGS) $(QWT_CFLAGS) $(GNURADIO_CORE_LIBS)
+qt_examples_LDADD = $(QWT_LIBS)        \
+                   $(QT_LIBS)          \
+                   $(GNURADIO_CORE_LA)
 
-MOSTLYCLEANFILES =                     \
-       *~
 
-CLEANFILES = $(filter moc_%.cc, $(qt_examples_SOURCES))                
+qt_examples_LDFLAGS = $(QT_CFLAGS)     \
+                     $(QWT_CFLAGS)
+
+MOSTLYCLEANFILES =                     \
+       *~ $(BUILT_SOURCES)

diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am
index 4f6da318a83f1c24e68f20cd504cf9f5c43248a1..4165e76086548807e91a1fe340c253a890a79714 100644 (file)
--- a/gr-radio-astronomy/src/lib/Makefile.am
+++ b/gr-radio-astronomy/src/lib/Makefile.am
@@ -65,9 +65,9 @@ _ra_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 # link the library against some comon swig runtime code and the 
 # c++ standard library
-_ra_la_LIBADD =                        \
-       $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+_ra_la_LIBADD =                \
+       $(PYTHON_LDFLAGS)       \
+       $(GNURADIO_CORE_LA)     \
        -lstdc++                        
 
 ra.cc ra.py: $(ALL_IFILES)

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index ef27bf580d08ea2bee5a4c568ff33b19168f30d3..bfb573cf3f8720db70dcce85f91963e1c5f2123e 100644 (file)
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -110,7 +110,7 @@ _trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 # c++ standard library
 _trellis_la_LIBADD =                   \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
        -lstdc++
 
 trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 8645ca5294a84ad9895558207003550b6b4bcd35..86c9853a69eef8977986bd7f1ea0efd871bba161 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -94,8 +94,8 @@ _usrp1_la_SOURCES =                   \
 
 _usrp1_la_LIBADD =                     \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
-       $(USRP_LIBS)                    \
+       $(GNURADIO_CORE_LA)             \
+       $(USRP_LA)                      \
        -lstdc++
 
 

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 9df1375c2cb24b02824fd17354b84aed2ab565c6..cf760993fd130387b3468739810bef05fb23e2a2 100644 (file)
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -69,7 +69,7 @@ swiginclude_HEADERS =                         \
 
 _video_sdl_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LIBS)           \
+       $(GNURADIO_CORE_LA)             \
         $(SDL_LIBS)                    \
        -lstdc++                                
 

diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am
index e1922fcd83aea6435d7416c5517bba20b41b0f84..8adaf14e36a6c06d21e939ece56c5254f4df3427 100644 (file)
--- a/mblock/src/lib/Makefile.am
+++ b/mblock/src/lib/Makefile.am
@@ -54,8 +54,8 @@ libmblock_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 # link the library against the c++ standard library
 libmblock_la_LIBADD =                  \
-       $(OMNITHREAD_LIBS)              \
-       $(PMT_LIBS)                     \
+       $(OMNITHREAD_LA)                \
+       $(PMT_LA)                       \
        -lstdc++                        
 
 include_HEADERS =                      \

diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am
index aa2cc514ba42a484e4b26a5360ee20e4cfbd1dbd..a738a16928a5f51763cc29aa8dcad44fc55d82d9 100644 (file)
--- a/pmt/src/lib/Makefile.am
+++ b/pmt/src/lib/Makefile.am
@@ -89,12 +89,8 @@ libpmt_qa_la_SOURCES =                       \
 # magic flags
 libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
-# link the library against the c++ standard library
-# Note: Win32 libtool doesn't pull dependencies from the .la file
-# correctly, so we must add $(PMT_LIBS) below
 libpmt_qa_la_LIBADD =                  \
        libpmt.la                       \
-       $(PMT_LIBS)                     \
        $(CPPUNIT_LIBS)                 \
        -lstdc++