diff options
| author | Eric Blossom | 2010-12-07 15:54:27 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-12-07 15:54:27 -0800 |
| commit | c6d4c7d5b410d066e55a31c787476a9ac96b1277 (patch) | |
| tree | b031f7d84cbb608b7df551d3afa84ad64cdfb8cc | |
| parent | 9911a8d9edcde54b9a18810f37799a58a6895310 (diff) | |
| download | gnuradio-c6d4c7d5b410d066e55a31c787476a9ac96b1277.tar.gz gnuradio-c6d4c7d5b410d066e55a31c787476a9ac96b1277.tar.bz2 gnuradio-c6d4c7d5b410d066e55a31c787476a9ac96b1277.zip | |
Moved out-of-tree includes out of gnuradio_core_INCLUDES to ensure that
in-tree includes are searched before out-of-tree includes.
| -rw-r--r-- | config/grc_gnuradio_core.m4 | 4 | ||||
| -rw-r--r-- | gcell/lib/wrapper/Makefile.am | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/Makefile.am | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index e60bdac59..4585b9ace 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -63,9 +63,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \ -I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \ --I\${abs_top_builddir}/gnuradio-core/src/lib/swig \ -\$(FFTW3F_CFLAGS) \ -\$(GSL_CFLAGS)" +-I\${abs_top_builddir}/gnuradio-core/src/lib/swig" gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" dnl gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i" gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" diff --git a/gcell/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am index 0676ebb70..5ec7e5615 100644 --- a/gcell/lib/wrapper/Makefile.am +++ b/gcell/lib/wrapper/Makefile.am @@ -20,7 +20,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(FFTW3F_CFLAGS) $(WITH_INCLUDES) +# $(WITH_INCLUDES) must _always_ be last +AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(FFTW3F_CPPFLAGS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libwrapper.la libwrapper-qa.la diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 0a34cb5b5..bf97d6cdc 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -26,7 +26,9 @@ include $(top_srcdir)/Makefile.common # other performance critical items # -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +# $(WITH_INCLUDES) must _always_ be last +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) \ + $(FFTW3F_CPPFLAGS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libfilter.la libfilter-qa.la diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 17623f0ba..08610c58a 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -21,7 +21,9 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +# $(WITH_INCLUDES) must _always_ be last +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) \ + $(FFTW3F_CPPFLAGS) $(GSL_CPPFLAGS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la |