diff options
| author | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
| commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
| tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-usrp/src/Makefile.am | |
| parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
| parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
| download | gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.gz gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.bz2 gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.zip | |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-usrp/src/Makefile.am')
| -rw-r--r-- | gr-usrp/src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
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) |