From 524db0cf19648e3c7c78d3e73103b7a0bdcd6bfc Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 18 Jan 2017 17:14:52 -0800 Subject: *: move source into src/ subdir Restoring some organizational sanity since adopting autotools. --- src/modules/ray/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/modules/ray/Makefile.am (limited to 'src/modules/ray/Makefile.am') diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am new file mode 100644 index 0000000..a0b3fbb --- /dev/null +++ b/src/modules/ray/Makefile.am @@ -0,0 +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../../ -- cgit v1.2.1 From 404a356b2b22a134aea151145d1baabf253ee491 Mon Sep 17 00:00:00 2001 From: Vito Caputo 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/ray/Makefile.am') 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 -- cgit v1.2.1