diff options
| author | Tom Rondeau | 2010-10-29 10:08:34 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2010-10-29 10:08:34 -0400 |
| commit | 0b9812f61b854591ec7b0f77214c3078bd5c3464 (patch) | |
| tree | 954745e7b7e6e8f47753a10526e95b0c3c3c8305 /gr-usrp | |
| parent | dd74b98a42f5e79c4d464cfa745b3f8af51e486e (diff) | |
| parent | cb2fa9a58c9a52f3501881964ee4f59992c5d84d (diff) | |
| download | gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.gz gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.bz2 gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.zip | |
Merge branch 'makefile_var_ordering'
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 92938061f..0f3a21bb4 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 572a22485..db5be4ade 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) |