X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile.in;h=aa1cd0a653c545dce818fbd8c163c64d8ba19e5b;hp=61d5dfe70af5190801ebedc3c465e225f1a2a4d3;hb=HEAD;hpb=96d01a50f7d3949ea598c404f1a26a8b909207f2

diff --git a/Makefile.in b/Makefile.in
index 61d5dfe..aa1cd0a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@ exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
 pkgdatadir = $(datadir)/@PACKAGE_TARNAME@
-bindir = $(exec_prefix)/bin
+bindir = @bindir@
 
 CC = @CC@
 CPPFLAGS = @CPPFLAGS@
@@ -40,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) -lm
+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@
@@ -68,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
 
@@ -84,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
 
@@ -119,7 +124,9 @@ 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
 
 program-clean: