From 48c4f03fc55bded8bcdcb4827c2c253b11028d14 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller <schaller@strw.leidenuniv.nl> Date: Wed, 25 Apr 2018 16:39:22 +0200 Subject: [PATCH] Propagate the non-standard installation path of FFTW to the Makefiles. --- examples/Makefile.am | 4 ++-- src/Makefile.am | 4 ++-- tests/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index a589b18435..95057c9bee 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,8 +18,8 @@ # Common flags MYFLAGS = -# Add the source directory and debug to CFLAGS -AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS) $(GSL_INCS) +# Add the source directory and the non-standard paths to the included library headers to CFLAGS +AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS) $(GSL_INCS) $(FFTW_INCS) AM_LDFLAGS = $(HDF5_LDFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index e21cb6539d..d8b633fe1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Add the debug flag to the whole thing -AM_CFLAGS = $(HDF5_CPPFLAGS) $(GSL_INCS) +# Add the non-standard paths to the included library headers +AM_CFLAGS = $(HDF5_CPPFLAGS) $(GSL_INCS) $(FFTW_INCS) # Assign a "safe" version number AM_LDFLAGS = $(HDF5_LDFLAGS) $(FFTW_LIBS) -version-info 0:0:0 diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a757e0b87..643d89aaf0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Add the source directory and debug to CFLAGS -AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS) $(GSL_INCS) +# Add the source directory and the non-standard paths to the included library headers to CFLAGS +AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS) $(GSL_INCS) $(FFTW_INCS) AM_LDFLAGS = ../src/.libs/libswiftsim.a $(HDF5_LDFLAGS) $(HDF5_LIBS) $(FFTW_LIBS) $(GRACKLE_LIBS) $(GSL_LIBS) -- GitLab