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 /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 'usrp2')
| -rw-r--r-- | usrp2/host/apps/Makefile.am | 6 | ||||
| -rw-r--r-- | usrp2/host/lib/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usrp2/host/apps/Makefile.am b/usrp2/host/apps/Makefile.am index 4a26898fa..087ab9e31 100644 --- a/usrp2/host/apps/Makefile.am +++ b/usrp2/host/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007, 2008 Free Software Foundation, Inc. +# Copyright 2007,2008,2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +19,9 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = \ $(USRP2_INCLUDES) \ + $(GRUEL_INCLUDES) \ $(STD_DEFINES_AND_INCLUDES) \ - $(CPPUNIT_INCLUDES) \ - $(GRUEL_INCLUDES) + $(CPPUNIT_INCLUDES) LDADD = \ $(USRP2_LA) \ 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 |