diff options
| author | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
| commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
| tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /Makefile.common | |
| parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
| parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
| download | gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.gz gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.bz2 gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.zip | |
Merge branch 'next' into tagging
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
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 |