From 2c2d1f34c11e590ccdf5b90ec0444cf6c3478379 Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Thu, 2 Nov 2017 12:24:24 +0100
Subject: [PATCH] Now code compiles
---
examples/Makefile.am | 6 +++---
src/Makefile.am | 8 +++++---
src/cooling/grackle/grackle_wrapper.c | 2 +-
src/cooling/grackle/grackle_wrapper.h | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9270298369..bddb329437 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -24,11 +24,11 @@ AM_CFLAGS = -I$(top_srcdir)/src $(HDF5_CPPFLAGS)
AM_LDFLAGS = $(HDF5_LDFLAGS)
# Extra libraries.
-EXTRA_LIBS = $(HDF5_LIBS) $(FFTW_LIBS) $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS)
+EXTRA_LIBS = $(HDF5_LIBS) $(FFTW_LIBS) $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS) $(GRACKLE_LIBS)
# MPI libraries.
-MPI_LIBS = $(METIS_LIBS) $(GRACKLE_LIBS) $(MPI_THREAD_LIBS)
-MPI_FLAGS = -DWITH_MPI $(METIS_INCS) $(GRACKLE_INCS)
+MPI_LIBS = $(METIS_LIBS) $(MPI_THREAD_LIBS)
+MPI_FLAGS = -DWITH_MPI $(METIS_INCS)
# Programs.
bin_PROGRAMS = swift
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f2985702f..91affa55f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+AUTOMAKE_OPTIONS = subdir-objects
# Add the debug flag to the whole thing
AM_CFLAGS = $(HDF5_CPPFLAGS)
@@ -25,11 +26,11 @@ AM_LDFLAGS = $(HDF5_LDFLAGS) $(FFTW_LIBS) -version-info 0:0:0
GIT_CMD = @GIT_CMD@
# Additional dependencies for shared libraries.
-EXTRA_LIBS = $(HDF5_LIBS) $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS)
+EXTRA_LIBS = $(HDF5_LIBS) $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS) $(GRACKLE_LIB)
# MPI libraries.
MPI_LIBS = $(METIS_LIBS) $(GRACKLE_LIB) $(MPI_THREAD_LIBS)
-MPI_FLAGS = -DWITH_MPI $(METIS_INCS) $(GRACKLE_LIB)
+MPI_FLAGS = -DWITH_MPI $(METIS_INCS)
# Build the libswiftsim library
lib_LTLIBRARIES = libswiftsim.la
@@ -57,7 +58,8 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
runner_doiact_fft.c threadpool.c cooling.c sourceterms.c \
statistics.c runner_doiact_vec.c profiler.c dump.c logger.c \
part_type.c xmf.c gravity_properties.c gravity.c \
- collectgroup.c hydro_space.c equation_of_state.c
+ collectgroup.c hydro_space.c equation_of_state.c \
+ cooling/grackle/grackle_wrapper.c
# Include files for distribution, not installation.
nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h \
diff --git a/src/cooling/grackle/grackle_wrapper.c b/src/cooling/grackle/grackle_wrapper.c
index 4aeefe0674..119e26a8b1 100644
--- a/src/cooling/grackle/grackle_wrapper.c
+++ b/src/cooling/grackle/grackle_wrapper.c
@@ -12,7 +12,7 @@
************************************************************************/
-#include <cooling/grackle/grackle_wrapper.h>
+#include "grackle_wrapper.h"
#define GRACKLE_DEBUG
diff --git a/src/cooling/grackle/grackle_wrapper.h b/src/cooling/grackle/grackle_wrapper.h
index c33f27b641..b4cdfa7fbb 100644
--- a/src/cooling/grackle/grackle_wrapper.h
+++ b/src/cooling/grackle/grackle_wrapper.h
@@ -13,7 +13,7 @@
#ifndef SWIFT_COOLING_GRACKLE_WRAPPER_H
#define SWIFT_COOLING_GRACKLE_WRAPPER_H
-#include <config.h>
+#include "config.h"
#include <grackle.h>
#include <math.h>
#include <stdio.h>
--
GitLab