From 11b87c843e20f66bd68e02353ba4a1072e1230a6 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 14 Feb 2021 22:43:08 -0800 Subject: *: split rototiller.[ch] into lib and main This is a first approximation of separating the core modules and threaded rendering from the cli-centric rototiller program and its sdl+drm video backends. Unfortunately this seemed to require switching over to libtool archives (.la) to permit consolidating the per-lib and per-module .a files into the librototiller.a and linking just with librototiller.a to depend on the aggregate of libs+modules+librototiller-glue in a simple fashion. If an alternative to .la comes up I will switch over to it, using libtool really slows down the build process. Those are implementation/build system details though. What's important in these changes is establishing something resembling a librototiller API boundary, enabling creating alternative frontends which vendor this tree as a submodule and link just to librototiller.{la,a} for all the modules+threaded rendering of them, while providing their own fb_ops_t for outputting into, and their own settings applicators for driving the modules setup. --- src/modules/compose/Makefile.am | 6 +++--- src/modules/drizzle/Makefile.am | 6 +++--- src/modules/flui2d/Makefile.am | 6 +++--- src/modules/julia/Makefile.am | 6 +++--- src/modules/meta2d/Makefile.am | 6 +++--- src/modules/montage/Makefile.am | 6 +++--- src/modules/pixbounce/Makefile.am | 6 +++--- src/modules/plasma/Makefile.am | 6 +++--- src/modules/plato/Makefile.am | 6 +++--- src/modules/ray/Makefile.am | 8 ++++---- src/modules/roto/Makefile.am | 6 +++--- src/modules/rtv/Makefile.am | 6 +++--- src/modules/snow/Makefile.am | 6 +++--- src/modules/sparkler/Makefile.am | 8 ++++---- src/modules/spiro/Makefile.am | 6 +++--- src/modules/stars/Makefile.am | 6 +++--- src/modules/submit/Makefile.am | 6 +++--- src/modules/swab/Makefile.am | 6 +++--- src/modules/swarm/Makefile.am | 6 +++--- 19 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/modules') diff --git a/src/modules/compose/Makefile.am b/src/modules/compose/Makefile.am index 926db7e..e77bf69 100644 --- a/src/modules/compose/Makefile.am +++ b/src/modules/compose/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libcompose.a -libcompose_a_SOURCES = compose.c -libcompose_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libcompose.la +libcompose_la_SOURCES = compose.c +libcompose_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/drizzle/Makefile.am b/src/modules/drizzle/Makefile.am index caaa45f..a6bb00b 100644 --- a/src/modules/drizzle/Makefile.am +++ b/src/modules/drizzle/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libdrizzle.a -libdrizzle_a_SOURCES = drizzle.c -libdrizzle_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libdrizzle.la +libdrizzle_la_SOURCES = drizzle.c +libdrizzle_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/flui2d/Makefile.am b/src/modules/flui2d/Makefile.am index 239de9e..90fc109 100644 --- a/src/modules/flui2d/Makefile.am +++ b/src/modules/flui2d/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libflui2d.a -libflui2d_a_SOURCES = flui2d.c -libflui2d_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libflui2d.la +libflui2d_la_SOURCES = flui2d.c +libflui2d_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/julia/Makefile.am b/src/modules/julia/Makefile.am index 8e94f14..a61bad8 100644 --- a/src/modules/julia/Makefile.am +++ b/src/modules/julia/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libjulia.a -libjulia_a_SOURCES = julia.c -libjulia_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libjulia.la +libjulia_la_SOURCES = julia.c +libjulia_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/meta2d/Makefile.am b/src/modules/meta2d/Makefile.am index b1394d1..73b00f4 100644 --- a/src/modules/meta2d/Makefile.am +++ b/src/modules/meta2d/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libmeta2d.a -libmeta2d_a_SOURCES = meta2d.c v2f.h v3f.h -libmeta2d_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libmeta2d.la +libmeta2d_la_SOURCES = meta2d.c v2f.h v3f.h +libmeta2d_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/montage/Makefile.am b/src/modules/montage/Makefile.am index 7465510..0c2c376 100644 --- a/src/modules/montage/Makefile.am +++ b/src/modules/montage/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libmontage.a -libmontage_a_SOURCES = montage.c -libmontage_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libmontage.la +libmontage_la_SOURCES = montage.c +libmontage_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/pixbounce/Makefile.am b/src/modules/pixbounce/Makefile.am index a55374a..6464dcb 100644 --- a/src/modules/pixbounce/Makefile.am +++ b/src/modules/pixbounce/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libpixbounce.a -libpixbounce_a_SOURCES = draw.h pixbounce.c -libpixbounce_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libpixbounce.la +libpixbounce_la_SOURCES = draw.h pixbounce.c +libpixbounce_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/plasma/Makefile.am b/src/modules/plasma/Makefile.am index a856df1..edb3760 100644 --- a/src/modules/plasma/Makefile.am +++ b/src/modules/plasma/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libplasma.a -libplasma_a_SOURCES = plasma.c -libplasma_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libplasma.la +libplasma_la_SOURCES = plasma.c +libplasma_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/plato/Makefile.am b/src/modules/plato/Makefile.am index d0b9069..b0550d8 100644 --- a/src/modules/plato/Makefile.am +++ b/src/modules/plato/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libplato.a -libplato_a_SOURCES = plato.c -libplato_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libplato.la +libplato_la_SOURCES = plato.c +libplato_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am index 637a921..f20850a 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.c -libray_a_CFLAGS = -ffast-math -libray_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libray.la +libray_la_SOURCES = ray.c +libray_la_CFLAGS = -ffast-math +libray_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/roto/Makefile.am b/src/modules/roto/Makefile.am index 6682751..2b704c1 100644 --- a/src/modules/roto/Makefile.am +++ b/src/modules/roto/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libroto.a -libroto_a_SOURCES = roto.c -libroto_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libroto.la +libroto_la_SOURCES = roto.c +libroto_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/rtv/Makefile.am b/src/modules/rtv/Makefile.am index 4d5cb6e..8a4f341 100644 --- a/src/modules/rtv/Makefile.am +++ b/src/modules/rtv/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = librtv.a -librtv_a_SOURCES = rtv.c -librtv_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = librtv.la +librtv_la_SOURCES = rtv.c +librtv_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/snow/Makefile.am b/src/modules/snow/Makefile.am index 73f767d..d4a602a 100644 --- a/src/modules/snow/Makefile.am +++ b/src/modules/snow/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libsnow.a -libsnow_a_SOURCES = snow.c -libsnow_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libsnow.la +libsnow_la_SOURCES = snow.c +libsnow_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/sparkler/Makefile.am b/src/modules/sparkler/Makefile.am index 40a9bc8..f056aac 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 list.h particle.c particle.h particles.c particles.h rocket.c simple.c spark.c sparkler.c v3f.h xplode.c -libsparkler_a_CFLAGS = -ffast-math -libsparkler_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libsparkler.la +libsparkler_la_SOURCES = bsp.c bsp.h burst.c chunker.c chunker.h container.h list.h particle.c particle.h particles.c particles.h rocket.c simple.c spark.c sparkler.c v3f.h xplode.c +libsparkler_la_CFLAGS = -ffast-math +libsparkler_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/spiro/Makefile.am b/src/modules/spiro/Makefile.am index f03d8cd..0f8a543 100644 --- a/src/modules/spiro/Makefile.am +++ b/src/modules/spiro/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libspiro.a -libspiro_a_SOURCES = draw.h spiro.c -libspiro_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libspiro.la +libspiro_la_SOURCES = draw.h spiro.c +libspiro_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/stars/Makefile.am b/src/modules/stars/Makefile.am index 20ee80e..ebeb4dd 100644 --- a/src/modules/stars/Makefile.am +++ b/src/modules/stars/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libstars.a -libstars_a_SOURCES = draw.h stars.c -libstars_a_CPPFLAGS = -I@top_srcdir@/src +noinst_LTLIBRARIES = libstars.la +libstars_la_SOURCES = draw.h stars.c +libstars_la_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/submit/Makefile.am b/src/modules/submit/Makefile.am index d8a02e4..23a2fda 100644 --- a/src/modules/submit/Makefile.am +++ b/src/modules/submit/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libsubmit.a -libsubmit_a_SOURCES = submit.c -libsubmit_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libsubmit.la +libsubmit_la_SOURCES = submit.c +libsubmit_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/swab/Makefile.am b/src/modules/swab/Makefile.am index 4db914b..c99265a 100644 --- a/src/modules/swab/Makefile.am +++ b/src/modules/swab/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libswab.a -libswab_a_SOURCES = swab.c -libswab_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libswab.la +libswab_la_SOURCES = swab.c +libswab_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs diff --git a/src/modules/swarm/Makefile.am b/src/modules/swarm/Makefile.am index 327aee8..555bd8e 100644 --- a/src/modules/swarm/Makefile.am +++ b/src/modules/swarm/Makefile.am @@ -1,3 +1,3 @@ -noinst_LIBRARIES = libswarm.a -libswarm_a_SOURCES = swarm.c -libswarm_a_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs +noinst_LTLIBRARIES = libswarm.la +libswarm_la_SOURCES = swarm.c +libswarm_la_CPPFLAGS = -I@top_srcdir@/src -I@top_srcdir@/src/libs -- cgit v1.2.1