Improve autoconf detection of sdl(_image|_mixer)

[vor.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9779ab2..a2ae2f9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,10 +40,10 @@ exe_name = @PACKAGE_TARNAME@@EXEEXT@
 
 
 paths := -DDATA_PREFIX=\"$(pkgdatadir)\"
-SDL_CFLAGS := @SDL_CFLAGS@
-SDL_LIBS := @SDL_LIBS@
+SDL_CFLAGS := @SDL_CFLAGS@ @SDL_MIXER_CFLAGS@ @SDL_IMAGE_CFLAGS@
+SDL_LIBS := @SDL_LIBS@ @SDL_MIXER_LIBS@ @SDL_IMAGE_LIBS@
 
-ldflags := $(SDL_LIBS) -lSDL_image -lSDL_mixer $(LDFLAGS)
+ldflags := $(SDL_LIBS) $(LDFLAGS)
 cflags := -I. $(SDL_CFLAGS) $(paths) $(CFLAGS)
 
 my_objects := args.@OBJEXT@ dust.@OBJEXT@ file.@OBJEXT@ mt.@OBJEXT@ rocks.@OBJEXT@ score.@OBJEXT@ sprite.@OBJEXT@ sound.@OBJEXT@ autopilot.@OBJEXT@
@@ -124,7 +124,7 @@ clean: program-clean
 distclean: clean
        rm -f Makefile config.h config.log config.status
 
-maintainer-clean: program-clean
+maintainer-clean: distclean
        @echo 'This command is intended for maintainers to use; it'
        @echo 'deletes files that may need special tools to rebuild.'
        rm -f $(graphics) font_guts font_guts.pov