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

[debian/gnuradio] / gnuradio-core / src / lib / swig / Makefile.am

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