X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile;h=a3c3847e8f2b9215b7ecb41aed4330206a7f26c5;hp=c6aa45b3442641ec75f74e393832ce919ab2cf62;hb=3b94094992bdbe85a4ac824e22df09b2a7362c27;hpb=47d10ee91e99f21602ce674ad140fc99b8986633

diff --git a/Makefile b/Makefile
index c6aa45b..a3c3847 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ sdl-ldflags := $(shell sdl-config --libs)
 ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
 cflags := $(sdl-cflags) $(paths) $(CFLAGS)
 
-my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o
+my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o autopilot.o
 my_objects += main.o
 libs := font.o
 objects := $(libs) $(my_objects)
@@ -39,10 +39,10 @@ rocks += 20 21 22 23 24 25 26 27 28 29
 rocks += 30 31 32 33 34 35 36 37 38 39
 rocks += 40 41 42 43 44 45 46 47 48 49
 rocks := $(rocks:%=data/rock%.png)
-graphics := data/ship.png data/life.png data/font.png $(rocks)
+graphics := data/ship.png data/icon.png data/life.png data/font.png $(rocks)
 
 INSTALL := install
-INSTALL_PROGRAM := $(INSTALL) -o games -g games
+INSTALL_PROGRAM := $(INSTALL) $(shell sh -c 'test "$$UID" "=" "0" && echo "-o games -g games"')
 INSTALL_DATA := $(INSTALL) -m 644
 
 
@@ -51,6 +51,8 @@ INSTALL_DATA := $(INSTALL) -m 644
 .PHONY: program program-clean install-program uninstall-program
 .PHONY: data data-clean install-data uninstall-data
 
+.INTERMEDIATE: font_guts font_guts.pov
+
 all: program data
 
 data: $(graphics)
@@ -67,11 +69,11 @@ font.o: font.h
 
 args.o: args.h
 
-dust.o: globals.h dust.h mt.h
+dust.o: globals.h dust.h float.h mt.h
 
 file.o: file.h common.h
 
-main.o: args.h common.h dust.h file.h globals.h mt.h rocks.h score.h sprite.h sound.h
+main.o: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
 
 mt.o: mt.h
 
@@ -105,10 +107,8 @@ data-clean:
 
 mkinstalldirs:
 	if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
-	if [ ! -d $(DATA_PREFIX)/icons ]; then mkdir $(DATA_PREFIX)/icons; fi
 
 rminstalldirs:
-	if [ -d $(DATA_PREFIX)/icons ]; then rmdir $(DATA_PREFIX)/icons; fi
 	if [ -d $(DATA_PREFIX) ]; then rmdir $(DATA_PREFIX); fi
 
 install: all mkinstalldirs install-program install-data
@@ -119,8 +119,10 @@ install-program: program
 install-data: data
 	$(INSTALL_DATA) ./data/*.png $(DATA_PREFIX)/
 	$(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
-	$(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
-	$(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
+	$(INSTALL_DATA) ./data/*.xm $(DATA_PREFIX)/
+	@echo
+	@echo "$(DATA_PREFIX)/icon.png (48x48) or ship.png (32x32) make good icons."
+	@echo
 
 uninstall: uninstall-program uninstall-data rminstalldirs
 
@@ -130,5 +132,4 @@ uninstall-program:
 uninstall-data:
 	rm -f $(DATA_PREFIX)/*.png
 	rm -f $(DATA_PREFIX)/*.wav
-	rm -f $(DATA_PREFIX)/*.mod
-	rm -f $(DATA_PREFIX)/icons/*
+	rm -f $(DATA_PREFIX)/*.xm