summaryrefslogtreecommitdiff
path: root/usrp2/host/lib
diff options
context:
space:
mode:
authorTom Rondeau2010-10-29 10:08:34 -0400
committerTom Rondeau2010-10-29 10:08:34 -0400
commit0b9812f61b854591ec7b0f77214c3078bd5c3464 (patch)
tree954745e7b7e6e8f47753a10526e95b0c3c3c8305 /usrp2/host/lib
parentdd74b98a42f5e79c4d464cfa745b3f8af51e486e (diff)
parentcb2fa9a58c9a52f3501881964ee4f59992c5d84d (diff)
downloadgnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.gz
gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.bz2
gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.zip
Merge branch 'makefile_var_ordering'
Diffstat (limited to 'usrp2/host/lib')
-rw-r--r--usrp2/host/lib/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/usrp2/host/lib/Makefile.am b/usrp2/host/lib/Makefile.am
index 209cb7095..85bec4673 100644
--- a/usrp2/host/lib/Makefile.am
+++ b/usrp2/host/lib/Makefile.am
@@ -19,10 +19,10 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(USRP2_INCLUDES) \
- $(BOOST_CPPFLAGS) \
+ $(GRUEL_INCLUDES) \
$(STD_DEFINES_AND_INCLUDES) \
- $(CPPUNIT_INCLUDES) \
- $(GRUEL_INCLUDES)
+ $(BOOST_CPPFLAGS) \
+ $(CPPUNIT_INCLUDES)
bin_PROGRAMS = usrp2_socket_opener
usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc