Now code compiles

examples/Makefile.am

@@ -27,8 +27,8 @@ AM_LDFLAGS = $(HDF5_LDFLAGS)
 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

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)
 

src/cooling/grackle/grackle_wrapper.h

@@ -13,14 +13,15 @@
 #ifndef SWIFT_COOLING_GRACKLE_WRAPPER_H
 #define SWIFT_COOLING_GRACKLE_WRAPPER_H
 
+#include "config.h"
+#include "error.h"
+
 #include <grackle.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
-#include "error.h"
 
 int wrap_init_cooling(char *CloudyTable, int UVbackground, double udensity,
                       double ulength, double utime, int grackle_chemistry);