diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-11-16 07:56:14 -0800 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-11-16 07:56:14 -0800 |
| commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
| tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-usrp | |
| parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
| parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-usrp')
| -rw-r--r-- | gr-usrp/apps/Makefile.am | 15 | ||||
| -rw-r--r-- | gr-usrp/src/Makefile.am | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am index 92938061f6..0f3a21bb4e 100644 --- a/gr-usrp/apps/Makefile.am +++ b/gr-usrp/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008,2009 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,19 +22,20 @@ include $(top_srcdir)/Makefile.common # For compiling within the GNU Radio build tree -AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \ - -I$(top_srcdir)/gr-usrp/src \ - $(USRP_INCLUDES) \ - $(WITH_INCLUDES) +AM_CPPFLAGS = \ + -I$(top_srcdir)/gr-usrp/src \ + $(USRP_INCLUDES) \ + $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_INCLUDES) GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la # For compiling outside the tree, these will get fished out by pkgconfig LDADD = \ + $(GR_USRP_LA) \ $(BOOST_LDFLAGS) \ - $(BOOST_PROGRAM_OPTIONS_LIB) \ - $(GR_USRP_LA) + $(BOOST_PROGRAM_OPTIONS_LIB) noinst_PROGRAMS = \ usrp_rx_cfile \ diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 572a22485b..db5be4aded 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -34,9 +34,9 @@ noinst_PYTHON = qa_usrp.py # The straight C++ library AM_CPPFLAGS = \ + $(USRP_INCLUDES) \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ - $(USRP_INCLUDES) \ $(USB_INCLUDES) \ $(WITH_INCLUDES) |