diff options
author | Vito Caputo <vcaputo@gnugeneration.com> | 2017-01-18 17:14:52 -0800 |
---|---|---|
committer | Vito Caputo <vcaputo@gnugeneration.com> | 2017-01-18 17:31:44 -0800 |
commit | 524db0cf19648e3c7c78d3e73103b7a0bdcd6bfc (patch) | |
tree | 6fd682629904a210927797c92d956c208666b03a | |
parent | ee2073d4e411555aba878277131b56f7eb562c84 (diff) |
*: move source into src/ subdir
Restoring some organizational sanity since adopting autotools.
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/drmsetup.c (renamed from drmsetup.c) | 0 | ||||
-rw-r--r-- | src/drmsetup.h (renamed from drmsetup.h) | 0 | ||||
-rw-r--r-- | src/fb.c (renamed from fb.c) | 0 | ||||
-rw-r--r-- | src/fb.h (renamed from fb.h) | 0 | ||||
-rw-r--r-- | src/fps.c (renamed from fps.c) | 0 | ||||
-rw-r--r-- | src/fps.h (renamed from fps.h) | 0 | ||||
-rw-r--r-- | src/modules/Makefile.am (renamed from modules/Makefile.am) | 0 | ||||
-rw-r--r-- | src/modules/ray/Makefile.am (renamed from modules/ray/Makefile.am) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray.c (renamed from modules/ray/ray.c) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray.h (renamed from modules/ray/ray.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_3f.h (renamed from modules/ray/ray_3f.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_camera.c (renamed from modules/ray/ray_camera.c) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_camera.h (renamed from modules/ray/ray_camera.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_color.h (renamed from modules/ray/ray_color.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_euler.h (renamed from modules/ray/ray_euler.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_light_emitter.h (renamed from modules/ray/ray_light_emitter.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object.c (renamed from modules/ray/ray_object.c) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object.h (renamed from modules/ray/ray_object.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object_light.h (renamed from modules/ray/ray_object_light.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object_plane.h (renamed from modules/ray/ray_object_plane.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object_point.h (renamed from modules/ray/ray_object_point.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object_sphere.h (renamed from modules/ray/ray_object_sphere.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_object_type.h (renamed from modules/ray/ray_object_type.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_ray.h (renamed from modules/ray/ray_ray.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_scene.c (renamed from modules/ray/ray_scene.c) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_scene.h (renamed from modules/ray/ray_scene.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_surface.h (renamed from modules/ray/ray_surface.h) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_threads.c (renamed from modules/ray/ray_threads.c) | 0 | ||||
-rw-r--r-- | src/modules/ray/ray_threads.h (renamed from modules/ray/ray_threads.h) | 0 | ||||
-rw-r--r-- | src/modules/roto/Makefile.am (renamed from modules/roto/Makefile.am) | 0 | ||||
-rw-r--r-- | src/modules/roto/roto.c (renamed from modules/roto/roto.c) | 0 | ||||
-rw-r--r-- | src/modules/roto/roto.h (renamed from modules/roto/roto.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/Makefile.am (renamed from modules/sparkler/Makefile.am) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/bsp.c (renamed from modules/sparkler/bsp.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/bsp.h (renamed from modules/sparkler/bsp.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/burst.c (renamed from modules/sparkler/burst.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/chunker.c (renamed from modules/sparkler/chunker.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/chunker.h (renamed from modules/sparkler/chunker.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/container.h (renamed from modules/sparkler/container.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/draw.h (renamed from modules/sparkler/draw.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/list.h (renamed from modules/sparkler/list.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/particle.c (renamed from modules/sparkler/particle.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/particle.h (renamed from modules/sparkler/particle.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/particles.c (renamed from modules/sparkler/particles.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/particles.h (renamed from modules/sparkler/particles.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/rocket.c (renamed from modules/sparkler/rocket.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/simple.c (renamed from modules/sparkler/simple.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/spark.c (renamed from modules/sparkler/spark.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/sparkler.c (renamed from modules/sparkler/sparkler.c) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/sparkler.h (renamed from modules/sparkler/sparkler.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/v3f.h (renamed from modules/sparkler/v3f.h) | 0 | ||||
-rw-r--r-- | src/modules/sparkler/xplode.c (renamed from modules/sparkler/xplode.c) | 0 | ||||
-rw-r--r-- | src/modules/stars/Makefile.am (renamed from modules/stars/Makefile.am) | 0 | ||||
-rw-r--r-- | src/modules/stars/draw.h (renamed from modules/stars/draw.h) | 0 | ||||
-rw-r--r-- | src/modules/stars/stars.c (renamed from modules/stars/stars.c) | 0 | ||||
-rw-r--r-- | src/modules/stars/stars.h (renamed from modules/stars/stars.h) | 0 | ||||
-rw-r--r-- | src/modules/stars/starslib.c (renamed from modules/stars/starslib.c) | 0 | ||||
-rw-r--r-- | src/modules/stars/starslib.h (renamed from modules/stars/starslib.h) | 0 | ||||
-rw-r--r-- | src/rototiller.c (renamed from rototiller.c) | 0 | ||||
-rw-r--r-- | src/rototiller.h (renamed from rototiller.h) | 0 | ||||
-rw-r--r-- | src/util.c (renamed from util.c) | 0 | ||||
-rw-r--r-- | src/util.h (renamed from util.h) | 0 |
65 files changed, 12 insertions, 10 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/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..a0b3fbb 100644 --- a/modules/ray/Makefile.am +++ b/src/modules/ray/Makefile.am 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..08d8522 100644 --- a/modules/roto/Makefile.am +++ b/src/modules/roto/Makefile.am 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..13d8e8a 100644 --- a/modules/sparkler/Makefile.am +++ b/src/modules/sparkler/Makefile.am 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..e709e85 100644 --- a/modules/stars/Makefile.am +++ b/src/modules/stars/Makefile.am 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 |