summaryrefslogtreecommitdiff
path: root/gr-usrp2/src
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2010-11-16 07:56:14 -0800
committerTom Rondeau <trondeau@vt.edu>2010-11-16 07:56:14 -0800
commit559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch)
tree221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-usrp2/src
parenta6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff)
parent53eee1c624794056fcba50a5eb50b864cbf159dd (diff)
Merge branch 'next' into tagging
Diffstat (limited to 'gr-usrp2/src')
-rw-r--r--gr-usrp2/src/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 03b6d0dd9d..0d55d73ba6 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