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 /gnuradio-core/src | |
| 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 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 15 | ||||
| -rw-r--r-- | gnuradio-core/src/tests/Makefile.am | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index 70a4de08e..171c85edd 100644 --- 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 f0d161514..2a770a3fb 100644 --- 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 f347c1874..aed3fea9a 100644 --- 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 |