diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-06 04:31:17 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-06 04:31:17 +0000 |
| commit | 951966ca64fc1ddd24889f6318c8c8794657cfba (patch) | |
| tree | 610eb170a28db4cc195354594ad510bd7423593d /usrp | |
| parent | db1b2f7c85600ffd108bd69a381505e0e7223a8a (diff) | |
Partial fix for ticket 10 merged into trunk from
branches/developers/jcorgan/ticket-10
As of this merge the trunk and the above branch are identical.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp')
| -rw-r--r-- | usrp/host/apps/Makefile.am | 14 | ||||
| -rw-r--r-- | usrp/host/lib/Makefile.am | 5 | ||||
| -rw-r--r-- | usrp/host/swig/Makefile.am | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am index b08e325277..87a3774a08 100644 --- a/usrp/host/apps/Makefile.am +++ b/usrp/host/apps/Makefile.am @@ -19,7 +19,11 @@ # Boston, MA 02111-1307, USA. # -INCLUDES = -I../lib -I$(top_srcdir)/usrp/firmware/include +include $(top_srcdir)/Makefile.common + +INCLUDES = $(USRP_INCLUDES) + +USRP_LIB = $(top_builddir)/usrp/host/lib/libusrp.la bin_PROGRAMS = \ usrper \ @@ -41,13 +45,13 @@ noinst_PYTHON = \ check_order_quickly_SOURCES = check_order_quickly.cc test_usrp_standard_rx_SOURCES = test_usrp_standard_rx.cc time_stuff.c -test_usrp_standard_rx_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la +test_usrp_standard_rx_LDADD = $(USRP_LIB) test_usrp_standard_tx_SOURCES = test_usrp_standard_tx.cc time_stuff.c -test_usrp_standard_tx_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la +test_usrp_standard_tx_LDADD = $(USRP_LIB) usrper_SOURCES = usrper.cc -usrper_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la +usrper_LDADD = $(USRP_LIB) usrp_cal_dc_offset_SOURCES = usrp_cal_dc_offset.cc -usrp_cal_dc_offset_LDADD = $(top_builddir)/usrp/host/lib/libusrp.la +usrp_cal_dc_offset_LDADD = $(USRP_LIB) diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index e2086bc2ce..eff0384606 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -17,7 +17,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -INCLUDES = -I$(top_srcdir)/usrp/firmware/include + +include $(top_srcdir)/Makefile.common + +INCLUDES = $(USRP_INCLUDES) lib_LTLIBRARIES = libusrp.la diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index 5b15a36342..2a1f5b8a5d 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,6 +27,9 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(pythondir) ourlibdir = $(pyexecdir) +INCLUDES = $(USRP_INCLUDES) \ + $(PYTHON_CPPFLAGS) \ + -I$(srcdir) LOCAL_IFILES = \ prims.i @@ -51,9 +54,6 @@ ourpython_PYTHON = \ usrp_prims.py -INCLUDES = $(USRP_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) - - SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) |