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-usrp2 | |
| 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-usrp2')
| -rw-r--r-- | gr-usrp2/src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 03b6d0dd9..0d55d73ba 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/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 # @@ -42,10 +42,10 @@ DISTCLEANFILES = run_tests # libgr-usrp.so # ---------------------------------------------------------------------- AM_CPPFLAGS = \ - $(STD_DEFINES_AND_INCLUDES) \ $(GRUEL_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ $(USRP2_INCLUDES) \ + $(STD_DEFINES_AND_INCLUDES) \ + $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) lib_LTLIBRARIES = libgnuradio-usrp2.la |