summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorTom Rondeau2010-10-29 10:08:34 -0400
committerTom Rondeau2010-10-29 10:08:34 -0400
commit0b9812f61b854591ec7b0f77214c3078bd5c3464 (patch)
tree954745e7b7e6e8f47753a10526e95b0c3c3c8305 /Makefile.common
parentdd74b98a42f5e79c4d464cfa745b3f8af51e486e (diff)
parentcb2fa9a58c9a52f3501881964ee4f59992c5d84d (diff)
downloadgnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.gz
gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.bz2
gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.zip
Merge branch 'makefile_var_ordering'
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common
index fb83b9470..95dacf987 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -57,8 +57,8 @@ libspudir = $(libdir)spu
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
- $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) \
+ $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS)
# when including for compilation from pre-installed libraries and such,
# need to make sure those are put last on the compile command