Merge build system cleanups

- Move source to src/ subdir
- Use $(top_srcdir)/src instead of ../../

65 files changed, 16 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 1757d1d..38bdf12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,2 @@
-SUBDIRS = modules
-bin_PROGRAMS = rototiller
-rototiller_SOURCES = drmsetup.c drmsetup.h fb.c fb.h fps.c fps.h rototiller.c rototiller.h util.c util.h
-rototiller_LDADD = @ROTOTILLER_LIBS@ -lm modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a
-rototiller_CPPFLAGS = @ROTOTILLER_CFLAGS@
+SUBDIRS = src
 dist_doc_DATA = README
diff --git a/configure.ac b/configure.ac
index b7d0836..60f031a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,10 +15,11 @@ CC="$PTHREAD_CC"
 
 AC_CONFIG_FILES([
  Makefile
- modules/Makefile
- modules/ray/Makefile
- modules/roto/Makefile
- modules/sparkler/Makefile
- modules/stars/Makefile
+ src/Makefile
+ src/modules/Makefile
+ src/modules/ray/Makefile
+ src/modules/roto/Makefile
+ src/modules/sparkler/Makefile
+ src/modules/stars/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..4203c02
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = modules
+bin_PROGRAMS = rototiller
+rototiller_SOURCES = drmsetup.c drmsetup.h fb.c fb.h fps.c fps.h rototiller.c rototiller.h util.c util.h
+rototiller_LDADD = @ROTOTILLER_LIBS@ -lm modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a
+rototiller_CPPFLAGS = @ROTOTILLER_CFLAGS@
diff --git a/drmsetup.c b/src/drmsetup.c
index 3670974..3670974 100644
--- a/drmsetup.c
+++ b/src/drmsetup.c
diff --git a/drmsetup.h b/src/drmsetup.h
index 61af2d5..61af2d5 100644
--- a/drmsetup.h
+++ b/src/drmsetup.h
diff --git a/fb.c b/src/fb.c
index 4d1a562..4d1a562 100644
--- a/fb.c
+++ b/src/fb.c
diff --git a/fb.h b/src/fb.h
index 13f6bcd..13f6bcd 100644
--- a/fb.h
+++ b/src/fb.h
diff --git a/fps.c b/src/fps.c
index 99a3f85..99a3f85 100644
--- a/fps.c
+++ b/src/fps.c
diff --git a/fps.h b/src/fps.h
index 1f986c7..1f986c7 100644
--- a/fps.h
+++ b/src/fps.h
diff --git a/modules/Makefile.am b/src/modules/Makefile.am
index a291174..a291174 100644
--- a/modules/Makefile.am
+++ b/src/modules/Makefile.am
diff --git a/modules/ray/Makefile.am b/src/modules/ray/Makefile.am
index a0b3fbb..6c9a50a 100644
--- a/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/modules/ray/ray.c b/src/modules/ray/ray.c
index 60d08cf..60d08cf 100644
--- a/modules/ray/ray.c
+++ b/src/modules/ray/ray.c
diff --git a/modules/ray/ray.h b/src/modules/ray/ray.h
index d33f96a..d33f96a 100644
--- a/modules/ray/ray.h
+++ b/src/modules/ray/ray.h
diff --git a/modules/ray/ray_3f.h b/src/modules/ray/ray_3f.h
index 8408abb..8408abb 100644
--- a/modules/ray/ray_3f.h
+++ b/src/modules/ray/ray_3f.h
diff --git a/modules/ray/ray_camera.c b/src/modules/ray/ray_camera.c
index 0703c2e..0703c2e 100644
--- a/modules/ray/ray_camera.c
+++ b/src/modules/ray/ray_camera.c
diff --git a/modules/ray/ray_camera.h b/src/modules/ray/ray_camera.h
index 387f8c5..387f8c5 100644
--- a/modules/ray/ray_camera.h
+++ b/src/modules/ray/ray_camera.h
diff --git a/modules/ray/ray_color.h b/src/modules/ray/ray_color.h
index 9fe62c1..9fe62c1 100644
--- a/modules/ray/ray_color.h
+++ b/src/modules/ray/ray_color.h
diff --git a/modules/ray/ray_euler.h b/src/modules/ray/ray_euler.h
index 86f5221..86f5221 100644
--- a/modules/ray/ray_euler.h
+++ b/src/modules/ray/ray_euler.h
diff --git a/modules/ray/ray_light_emitter.h b/src/modules/ray/ray_light_emitter.h
index 3b5509e..3b5509e 100644
--- a/modules/ray/ray_light_emitter.h
+++ b/src/modules/ray/ray_light_emitter.h
diff --git a/modules/ray/ray_object.c b/src/modules/ray/ray_object.c
index 4c5ccaf..4c5ccaf 100644
--- a/modules/ray/ray_object.c
+++ b/src/modules/ray/ray_object.c
diff --git a/modules/ray/ray_object.h b/src/modules/ray/ray_object.h
index abdb254..abdb254 100644
--- a/modules/ray/ray_object.h
+++ b/src/modules/ray/ray_object.h
diff --git a/modules/ray/ray_object_light.h b/src/modules/ray/ray_object_light.h
index 342c050..342c050 100644
--- a/modules/ray/ray_object_light.h
+++ b/src/modules/ray/ray_object_light.h
diff --git a/modules/ray/ray_object_plane.h b/src/modules/ray/ray_object_plane.h
index b33f342..b33f342 100644
--- a/modules/ray/ray_object_plane.h
+++ b/src/modules/ray/ray_object_plane.h
diff --git a/modules/ray/ray_object_point.h b/src/modules/ray/ray_object_point.h
index c0c9610..c0c9610 100644
--- a/modules/ray/ray_object_point.h
+++ b/src/modules/ray/ray_object_point.h
diff --git a/modules/ray/ray_object_sphere.h b/src/modules/ray/ray_object_sphere.h
index 85b3d93..85b3d93 100644
--- a/modules/ray/ray_object_sphere.h
+++ b/src/modules/ray/ray_object_sphere.h
diff --git a/modules/ray/ray_object_type.h b/src/modules/ray/ray_object_type.h
index 6ce20f5..6ce20f5 100644
--- a/modules/ray/ray_object_type.h
+++ b/src/modules/ray/ray_object_type.h
diff --git a/modules/ray/ray_ray.h b/src/modules/ray/ray_ray.h
index 91469a2..91469a2 100644
--- a/modules/ray/ray_ray.h
+++ b/src/modules/ray/ray_ray.h
diff --git a/modules/ray/ray_scene.c b/src/modules/ray/ray_scene.c
index e44990b..e44990b 100644
--- a/modules/ray/ray_scene.c
+++ b/src/modules/ray/ray_scene.c
diff --git a/modules/ray/ray_scene.h b/src/modules/ray/ray_scene.h
index e9781c6..e9781c6 100644
--- a/modules/ray/ray_scene.h
+++ b/src/modules/ray/ray_scene.h
diff --git a/modules/ray/ray_surface.h b/src/modules/ray/ray_surface.h
index b3e3c68..b3e3c68 100644
--- a/modules/ray/ray_surface.h
+++ b/src/modules/ray/ray_surface.h
diff --git a/modules/ray/ray_threads.c b/src/modules/ray/ray_threads.c
index 2369687..2369687 100644
--- a/modules/ray/ray_threads.c
+++ b/src/modules/ray/ray_threads.c
diff --git a/modules/ray/ray_threads.h b/src/modules/ray/ray_threads.h
index b4c601d..b4c601d 100644
--- a/modules/ray/ray_threads.h
+++ b/src/modules/ray/ray_threads.h
diff --git a/modules/roto/Makefile.am b/src/modules/roto/Makefile.am
index 08d8522..826a9d5 100644
--- a/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/modules/roto/roto.c b/src/modules/roto/roto.c
index d789f85..d789f85 100644
--- a/modules/roto/roto.c
+++ b/src/modules/roto/roto.c
diff --git a/modules/roto/roto.h b/src/modules/roto/roto.h
index 84a66a9..84a66a9 100644
--- a/modules/roto/roto.h
+++ b/src/modules/roto/roto.h
diff --git a/modules/sparkler/Makefile.am b/src/modules/sparkler/Makefile.am
index 13d8e8a..ed85f36 100644
--- a/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/modules/sparkler/bsp.c b/src/modules/sparkler/bsp.c
index 381e922..381e922 100644
--- a/modules/sparkler/bsp.c
+++ b/src/modules/sparkler/bsp.c
diff --git a/modules/sparkler/bsp.h b/src/modules/sparkler/bsp.h
index f5ce303..f5ce303 100644
--- a/modules/sparkler/bsp.h
+++ b/src/modules/sparkler/bsp.h
diff --git a/modules/sparkler/burst.c b/src/modules/sparkler/burst.c
index 828ca02..828ca02 100644
--- a/modules/sparkler/burst.c
+++ b/src/modules/sparkler/burst.c
diff --git a/modules/sparkler/chunker.c b/src/modules/sparkler/chunker.c
index ca072eb..ca072eb 100644
--- a/modules/sparkler/chunker.c
+++ b/src/modules/sparkler/chunker.c
diff --git a/modules/sparkler/chunker.h b/src/modules/sparkler/chunker.h
index ac53cec..ac53cec 100644
--- a/modules/sparkler/chunker.h
+++ b/src/modules/sparkler/chunker.h
diff --git a/modules/sparkler/container.h b/src/modules/sparkler/container.h
index a3779e8..a3779e8 100644
--- a/modules/sparkler/container.h
+++ b/src/modules/sparkler/container.h
diff --git a/modules/sparkler/draw.h b/src/modules/sparkler/draw.h
index 5010374..5010374 100644
--- a/modules/sparkler/draw.h
+++ b/src/modules/sparkler/draw.h
diff --git a/modules/sparkler/list.h b/src/modules/sparkler/list.h
index 48bca36..48bca36 100644
--- a/modules/sparkler/list.h
+++ b/src/modules/sparkler/list.h
diff --git a/modules/sparkler/particle.c b/src/modules/sparkler/particle.c
index 0e3d2c8..0e3d2c8 100644
--- a/modules/sparkler/particle.c
+++ b/src/modules/sparkler/particle.c
diff --git a/modules/sparkler/particle.h b/src/modules/sparkler/particle.h
index 95c117e..95c117e 100644
--- a/modules/sparkler/particle.h
+++ b/src/modules/sparkler/particle.h
diff --git a/modules/sparkler/particles.c b/src/modules/sparkler/particles.c
index 0eb260e..0eb260e 100644
--- a/modules/sparkler/particles.c
+++ b/src/modules/sparkler/particles.c
diff --git a/modules/sparkler/particles.h b/src/modules/sparkler/particles.h
index 689934b..689934b 100644
--- a/modules/sparkler/particles.h
+++ b/src/modules/sparkler/particles.h
diff --git a/modules/sparkler/rocket.c b/src/modules/sparkler/rocket.c
index 6b9dc5e..6b9dc5e 100644
--- a/modules/sparkler/rocket.c
+++ b/src/modules/sparkler/rocket.c
diff --git a/modules/sparkler/simple.c b/src/modules/sparkler/simple.c
index e453e46..e453e46 100644
--- a/modules/sparkler/simple.c
+++ b/src/modules/sparkler/simple.c
diff --git a/modules/sparkler/spark.c b/src/modules/sparkler/spark.c
index ea68ac2..ea68ac2 100644
--- a/modules/sparkler/spark.c
+++ b/src/modules/sparkler/spark.c
diff --git a/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index 0bb0fcf..0bb0fcf 100644
--- a/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
diff --git a/modules/sparkler/sparkler.h b/src/modules/sparkler/sparkler.h
index 3beb610..3beb610 100644
--- a/modules/sparkler/sparkler.h
+++ b/src/modules/sparkler/sparkler.h
diff --git a/modules/sparkler/v3f.h b/src/modules/sparkler/v3f.h
index 8bf7e24..8bf7e24 100644
--- a/modules/sparkler/v3f.h
+++ b/src/modules/sparkler/v3f.h
diff --git a/modules/sparkler/xplode.c b/src/modules/sparkler/xplode.c
index 24a436e..24a436e 100644
--- a/modules/sparkler/xplode.c
+++ b/src/modules/sparkler/xplode.c
diff --git a/modules/stars/Makefile.am b/src/modules/stars/Makefile.am
index e709e85..2e2c243 100644
--- a/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
diff --git a/modules/stars/draw.h b/src/modules/stars/draw.h
index 5010374..5010374 100644
--- a/modules/stars/draw.h
+++ b/src/modules/stars/draw.h
diff --git a/modules/stars/stars.c b/src/modules/stars/stars.c
index e009714..e009714 100644
--- a/modules/stars/stars.c
+++ b/src/modules/stars/stars.c
diff --git a/modules/stars/stars.h b/src/modules/stars/stars.h
index 70ef6f2..70ef6f2 100644
--- a/modules/stars/stars.h
+++ b/src/modules/stars/stars.h
diff --git a/modules/stars/starslib.c b/src/modules/stars/starslib.c
index 9d43062..9d43062 100644
--- a/modules/stars/starslib.c
+++ b/src/modules/stars/starslib.c
diff --git a/modules/stars/starslib.h b/src/modules/stars/starslib.h
index 0c125a3..0c125a3 100644
--- a/modules/stars/starslib.h
+++ b/src/modules/stars/starslib.h
diff --git a/rototiller.c b/src/rototiller.c
index 3fa9395..3fa9395 100644
--- a/rototiller.c
+++ b/src/rototiller.c
diff --git a/rototiller.h b/src/rototiller.h
index 0ff2c3f..0ff2c3f 100644
--- a/rototiller.h
+++ b/src/rototiller.h
diff --git a/util.c b/src/util.c
index 0e5825a..0e5825a 100644
--- a/util.c
+++ b/src/util.c
diff --git a/util.h b/src/util.h
index 549b529..549b529 100644
--- a/util.h
+++ b/src/util.h