summaryrefslogtreecommitdiff
path: root/gr-radar/src/lib/Makefile.am
diff options
context:
space:
mode:
authorjcorgan2006-08-07 15:41:19 +0000
committerjcorgan2006-08-07 15:41:19 +0000
commite27ba9aebfddf88cd245636d2f652a4ee4e289ec (patch)
tree01f44251578419823c34f140ee58d8fc6016a1c2 /gr-radar/src/lib/Makefile.am
parent37bee553f670da9c82b5a438fe06df3a1ca8b2aa (diff)
downloadgnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.gz
gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.bz2
gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.zip
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now successfully completes on a machine that has never had gnuradio installed before. In addition, several cleanups and refactoring of build system code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and gr-audio-windows have not been fully tested and will need verification by the maintainers of these components. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-radar/src/lib/Makefile.am')
-rw-r--r--gr-radar/src/lib/Makefile.am12
1 files changed, 5 insertions, 7 deletions
diff --git a/gr-radar/src/lib/Makefile.am b/gr-radar/src/lib/Makefile.am
index 8ea52aab4..be4b50379 100644
--- a/gr-radar/src/lib/Makefile.am
+++ b/gr-radar/src/lib/Makefile.am
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.radar module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -39,7 +37,7 @@ ALL_IFILES = \
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdr)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES =
@@ -66,16 +64,16 @@ bin_PROGRAMS = \
sim-airplane2
xambi_SOURCES = xambi.cc
-xambi_LDADD = libradar.la
+xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
eb_xambi_SOURCES = eb-xambi.cc
-eb_xambi_LDADD = libradar.la
+eb_xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
sim_airplane_SOURCES = sim-airplane.cc
-sim_airplane_LDADD = libradar.la
+sim_airplane_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
sim_airplane2_SOURCES = sim-airplane2.cc
-sim_airplane2_LDADD = libradar.la
+sim_airplane2_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
# This gets howto.py installed in the right place
# ourpython_PYTHON =