diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/modules/julia/Makefile.am | 3 | ||||
| -rw-r--r-- | src/modules/plasma/Makefile.am | 3 | ||||
| -rw-r--r-- | src/modules/ray/Makefile.am | 4 | ||||
| -rw-r--r-- | src/modules/roto/Makefile.am | 3 | ||||
| -rw-r--r-- | src/modules/sparkler/Makefile.am | 4 | ||||
| -rw-r--r-- | src/modules/stars/Makefile.am | 3 |
8 files changed, 13 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 9a53a1b..de7ee3e 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,10 @@ AM_PROG_CC_C_O AM_PROG_AR AC_PROG_RANLIB AM_SILENT_RULES([yes]) -PKG_CHECK_MODULES(ROTOTILLER, libdrm) + +PKG_CHECK_MODULES(DRM, libdrm) +LIBS="$DRM_LIBS $LIBS" +CFLAGS="$DRM_CFLAGS $CFLAGS" AX_PTHREAD LIBS="$PTHREAD_LIBS $LIBS" diff --git a/src/Makefile.am b/src/Makefile.am index 85f8214..3d6b8bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = modules bin_PROGRAMS = rototiller rototiller_SOURCES = drm_fb.c fb.c fb.h fps.c fps.h rototiller.c rototiller.h sdl_fb.c settings.h settings.c setup.h setup.c threads.c threads.h util.c util.h -rototiller_LDADD = @ROTOTILLER_LIBS@ -lm modules/julia/libjulia.a modules/plasma/libplasma.a modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a -rototiller_CPPFLAGS = @ROTOTILLER_CFLAGS@ +rototiller_LDADD = -lm modules/julia/libjulia.a modules/plasma/libplasma.a modules/ray/libray.a modules/roto/libroto.a modules/sparkler/libsparkler.a modules/stars/libstars.a diff --git a/src/modules/julia/Makefile.am b/src/modules/julia/Makefile.am index 54a9228..8e94f14 100644 --- a/src/modules/julia/Makefile.am +++ b/src/modules/julia/Makefile.am @@ -1,4 +1,3 @@ noinst_LIBRARIES = libjulia.a libjulia_a_SOURCES = julia.c -libjulia_a_CFLAGS = @ROTOTILLER_CFLAGS@ -libjulia_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libjulia_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/plasma/Makefile.am b/src/modules/plasma/Makefile.am index 16efeb4..a856df1 100644 --- a/src/modules/plasma/Makefile.am +++ b/src/modules/plasma/Makefile.am @@ -1,4 +1,3 @@ noinst_LIBRARIES = libplasma.a libplasma_a_SOURCES = plasma.c -libplasma_a_CFLAGS = @ROTOTILLER_CFLAGS@ -libplasma_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libplasma_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am index b62e4ba..6c5900a 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.c ray_euler.h ray_light_emitter.h 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_render.c ray_render.h ray_render_object.h ray_render_object_plane.h ray_render_object_point.h ray_render_object_sphere.h ray_scene.h ray_surface.h -libray_a_CFLAGS = @ROTOTILLER_CFLAGS@ -ffast-math -libray_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libray_a_CFLAGS = -ffast-math +libray_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/roto/Makefile.am b/src/modules/roto/Makefile.am index cbbbe88..6682751 100644 --- a/src/modules/roto/Makefile.am +++ b/src/modules/roto/Makefile.am @@ -1,4 +1,3 @@ noinst_LIBRARIES = libroto.a libroto_a_SOURCES = roto.c -libroto_a_CFLAGS = @ROTOTILLER_CFLAGS@ -libroto_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libroto_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/sparkler/Makefile.am b/src/modules/sparkler/Makefile.am index dc6089a..40a9bc8 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 = @ROTOTILLER_CFLAGS@ -ffast-math -libsparkler_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libsparkler_a_CFLAGS = -ffast-math +libsparkler_a_CPPFLAGS = -I@top_srcdir@/src diff --git a/src/modules/stars/Makefile.am b/src/modules/stars/Makefile.am index f1344a8..e72891e 100644 --- a/src/modules/stars/Makefile.am +++ b/src/modules/stars/Makefile.am @@ -1,4 +1,3 @@ noinst_LIBRARIES = libstars.a libstars_a_SOURCES = draw.h stars.c starslib.c starslib.h -libstars_a_CFLAGS = @ROTOTILLER_CFLAGS@ -libstars_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src +libstars_a_CPPFLAGS = -I@top_srcdir@/src |