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 /gnuradio-core/src/lib | |
| 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.
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/filter/Makefile.am | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
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 |