diff options
Diffstat (limited to 'Makefile.common')
-rw-r--r-- | Makefile.common | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index f0f02119a..390d7e900 100644 --- a/Makefile.common +++ b/Makefile.common @@ -37,23 +37,28 @@ grpyexecdir = $(pyexecdir)/gnuradio SWIGPYTHONFLAGS = -fvirtual -python -modern # 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/filter \ - -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \ + -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/omnithread \ -I$(top_srcdir)/gnuradio-core/src/lib/swig \ - -I$(top_builddir)/gnuradio-core/src/lib/swig \ + -I$(top_builddir)/gnuradio-core/src/lib/swig \ $(FFTW3F_CFLAGS) + # These used to be set in PKGCONFIG but now point to the current # build tree. GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ -lgnuradio-core -lfftw3f -lm -GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i +# This is a dependency for many swig operations +GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i # The below used to be set in PKGCONFIG but now point to the current # build tree. |