Improve autoconf detection of sdl(_image|_mixer)

[vor.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 31f5fe0..a2ae2f9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,14 +19,13 @@
 SHELL = /bin/sh
 VPATH = @srcdir@
 
-subdirs = @subdirs@
-top_srcdir = @top_srcdir@
 srcdir = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
-pkgdatadir = $(datarootdir)/@PACKAGE_TARNAME@
-bindir = $(exec_prefix)/bin
+datadir = @datadir@
+pkgdatadir = $(datadir)/@PACKAGE_TARNAME@
+bindir = @bindir@
 
 CC = @CC@
 CPPFLAGS = @CPPFLAGS@
@@ -41,11 +40,11 @@ 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)
-cflags := $(SDL_CFLAGS) $(paths) $(CFLAGS)
+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@
 my_objects += main.@OBJEXT@
@@ -69,12 +68,17 @@ INSTALL_DATA := $(INSTALL) -m 644
 .PHONY: mkinstalldirs rminstalldirs
 .PHONY: program program-clean install-program uninstall-program
 .PHONY: data data-clean install-data uninstall-data
+.PHONY: build-dir-data-link
 
 .INTERMEDIATE: font_guts font_guts.pov
 
 all: program data
 
-data: $(graphics)
+data: $(graphics) build-dir-data-link
+
+# symbolic link to data dir so you can run the game from the build dir:
+build-dir-data-link:
+       test -e data || ln -s $(srcdir)/data
 
 program: $(exe_name) @PACKAGE_TARNAME@.desktop
 
@@ -85,13 +89,13 @@ $(my_objects): vorconfig.h
 
 font.@OBJEXT@: font.h
 
-args.@OBJEXT@: args.h
+args.@OBJEXT@: args.h config.h
 
 dust.@OBJEXT@: globals.h dust.h float.h mt.h
 
 file.@OBJEXT@: file.h common.h
 
-main.@OBJEXT@: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
+main.@OBJEXT@: args.h common.h config.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
 
 mt.@OBJEXT@: mt.h
 
@@ -109,7 +113,7 @@ sprite.@OBJEXT@: sprite.h common.h
 $(exe_name): $(objects)
        $(CC) $^ $(ldflags) -o $@
 
-include gfx.mk
+include $(srcdir)/gfx.mk
 
 tags: *.c *.h
        exuberant-ctags *.c *.h /usr/include/SDL/*
@@ -117,14 +121,17 @@ tags: *.c *.h
 clean: program-clean
        rm -f tags
 
-maintainer-clean: program-clean data-clean
+distclean: clean
+       rm -f Makefile config.h config.log config.status
+
+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
 
 program-clean:
        rm -f *.@OBJEXT@ $(exe_name) @PACKAGE_TARNAME@.desktop
 
-data-clean:
-       rm -f $(graphics) font_guts font_guts.pov
-
 mkinstalldirs:
        if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir -p $(DESTDIR)$(pkgdatadir); fi
        if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
@@ -149,9 +156,9 @@ install-program: program
        $(INSTALL_PROGRAM) ./$(exe_name) $(DESTDIR)$(bindir)/
 
 install-data: data mkinstalldirs
-       $(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/
-       $(INSTALL_DATA) ./data/*.wav $(DESTDIR)$(pkgdatadir)/
-       $(INSTALL_DATA) ./data/*.xm $(DESTDIR)$(pkgdatadir)/
+       $(INSTALL_DATA) $(srcdir)/data/*.png $(DESTDIR)$(pkgdatadir)/
+       $(INSTALL_DATA) $(srcdir)/data/*.wav $(DESTDIR)$(pkgdatadir)/
+       $(INSTALL_DATA) $(srcdir)/data/*.xm $(DESTDIR)$(pkgdatadir)/
        @echo
        @echo "$(pkgdatadir)/icon.png (48x48) or ship.png (32x32) make good icons."
        @echo