projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.0.3
[debian/gnuradio]
/
gr-usrp
/
src
/
Makefile.in
diff --git
a/gr-usrp/src/Makefile.in
b/gr-usrp/src/Makefile.in
index 81e6f9ca4cc59eafbc57342411508e5d63a581f1..f41a1f603ab3b13555bc59d7f67572512eaf7e7d 100644
(file)
--- a/
gr-usrp/src/Makefile.in
+++ b/
gr-usrp/src/Makefile.in
@@
-37,7
+37,7
@@
# -*- Makefile -*-
#
# -*- Makefile -*-
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006
,2007
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-146,8
+146,11
@@
am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \
ourlibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(ourlib_LTLIBRARIES)
am__DEPENDENCIES_1 =
ourlibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(ourlib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+am__DEPENDENCIES_3 = $(top_builddir)/usrp/host/lib/libusrp.la
+_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_3)
am__usrp1_la_OBJECTS = usrp1.lo usrp1_sink_base.lo usrp1_sink_c.lo \
usrp1_sink_s.lo usrp1_source_base.lo usrp1_source_c.lo \
usrp1_source_s.lo
am__usrp1_la_OBJECTS = usrp1.lo usrp1_sink_base.lo usrp1_sink_c.lo \
usrp1_sink_s.lo usrp1_source_base.lo usrp1_source_c.lo \
usrp1_source_s.lo
@@
-409,25
+412,17
@@
GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
$(FFTW3F_CFLAGS)
$(FFTW3F_CFLAGS)
-# These used to be set in PKGCONFIG but now point to the current
-# build tree.
-GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
- -lgnuradio-core -lfftw3f -lm
-
+# 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
# 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_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
-I$(top_srcdir)/usrp/firmware/include
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
- -lusrp
-
-PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
-PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
@@
-501,8
+496,8
@@
_usrp1_la_SOURCES = \
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_L
IBS)
\
- $(USRP_L
IBS)
\
+ $(GNURADIO_CORE_L
A)
\
+ $(USRP_L
A)
\
-lstdc++
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-lstdc++
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version