From 404a356b2b22a134aea151145d1baabf253ee491 Mon Sep 17 00:00:00 2001
From: Vito Caputo <vcaputo@gnugeneration.com>
Date: Wed, 18 Jan 2017 18:03:38 -0800
Subject: autotools: s#../../#@top_srcdir@/src#

The relative path broke out-of-tree builds.

Previously the following:

$ mkdir /tmp/foo
$ cd /tmp/foo
$ ~/src/rototiller/configure
$ make

Would fail to compile unable to locate the headers in
~/rototiller/src

This fixes it.
---
 src/modules/ray/Makefile.am      | 2 +-
 src/modules/roto/Makefile.am     | 2 +-
 src/modules/sparkler/Makefile.am | 2 +-
 src/modules/stars/Makefile.am    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am
index a0b3fbb..6c9a50a 100644
--- a/src/modules/ray/Makefile.am
+++ b/src/modules/ray/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libray.a
 libray_a_SOURCES = ray_3f.h ray.c ray_camera.c ray_camera.h ray_color.h ray_euler.h ray.h ray_light_emitter.h ray_object.c ray_object.h ray_object_light.h ray_object_plane.h ray_object_point.h ray_object_sphere.h ray_object_type.h ray_ray.h ray_scene.c ray_scene.h ray_surface.h ray_threads.c ray_threads.h
 libray_a_CFLAGS = @ROTOTILLER_CFLAGS@ -ffast-math
-libray_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I../../
+libray_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src
diff --git a/src/modules/roto/Makefile.am b/src/modules/roto/Makefile.am
index 08d8522..826a9d5 100644
--- a/src/modules/roto/Makefile.am
+++ b/src/modules/roto/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libroto.a
 libroto_a_SOURCES = roto.c roto.h
 libroto_a_CFLAGS = @ROTOTILLER_CFLAGS@
-libroto_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I../../
+libroto_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src
diff --git a/src/modules/sparkler/Makefile.am b/src/modules/sparkler/Makefile.am
index 13d8e8a..ed85f36 100644
--- a/src/modules/sparkler/Makefile.am
+++ b/src/modules/sparkler/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libsparkler.a
 libsparkler_a_SOURCES = bsp.c bsp.h burst.c chunker.c chunker.h container.h draw.h list.h particle.c particle.h particles.c particles.h rocket.c simple.c spark.c sparkler.c sparkler.h v3f.h xplode.c
 libsparkler_a_CFLAGS = @ROTOTILLER_CFLAGS@ -ffast-math
-libsparkler_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I../../
+libsparkler_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src
diff --git a/src/modules/stars/Makefile.am b/src/modules/stars/Makefile.am
index e709e85..2e2c243 100644
--- a/src/modules/stars/Makefile.am
+++ b/src/modules/stars/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libstars.a
 libstars_a_SOURCES = draw.h stars.c stars.h starslib.c starslib.h
 libstars_a_CFLAGS = @ROTOTILLER_CFLAGS@
-libstars_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I../../
+libstars_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src
-- 
cgit v1.2.1