-# Where to find gnuradio include files in the current build tree
-# top_srcdir for original stuff, top_builddir for generated files
-GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
- -I$(top_srcdir)/gnuradio-core/src/lib/general \
- -I$(top_builddir)/gnuradio-core/src/lib/general \
- -I$(top_srcdir)/gnuradio-core/src/lib/gengen \
- -I$(top_builddir)/gnuradio-core/src/lib/gengen \
- -I$(top_srcdir)/gnuradio-core/src/lib/filter \
- -I$(top_builddir)/gnuradio-core/src/lib/filter \
- -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
- -I$(top_srcdir)/gnuradio-core/src/lib/io \
- -I$(top_srcdir)/gnuradio-core/src/lib/g72x \
- -I$(top_srcdir)/gnuradio-core/src/lib/swig \
- -I$(top_builddir)/gnuradio-core/src/lib/swig \
- $(FFTW3F_CFLAGS)
+# 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) \
+ $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+
+# when including for compilation from pre-installed libraries and such,
+# need to make sure those are put last on the compile command
+WITH_INCLUDES = @with_INCLUDES@
+WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@