X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile;h=92401adde304c7eb1a6ca4fe92f98de238d5de29;hp=e94a765ff5b2f168c15c421ada1304c034e6b9c6;hb=e3edccb30438fa531aca19132a7ca532d3ac5dc9;hpb=88a9e026caed5568363cefb7d49308b875dc5e4a

diff --git a/Makefile b/Makefile
index e94a765..92401ad 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ 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
@@ -67,11 +67,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
 
 mt.o: mt.h
 
@@ -98,17 +98,15 @@ clean: program-clean
 maintainer-clean: program-clean data-clean
 
 program-clean:
-	rm -f *.o vor font_guts font_guts.pov
+	rm -f *.o vor
 
 data-clean:
-	rm -f $(graphics) font_guts.pov
+	rm -f $(graphics) font_guts font_guts.pov
 
 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
@@ -120,7 +118,9 @@ 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/
+	@echo
+	@echo "$(DATA_PREFIX)/icon.png (48x48) or ship.png (32x32) make good icons."
+	@echo
 
 uninstall: uninstall-program uninstall-data rminstalldirs
 
@@ -131,4 +131,3 @@ uninstall-data:
 	rm -f $(DATA_PREFIX)/*.png
 	rm -f $(DATA_PREFIX)/*.wav
 	rm -f $(DATA_PREFIX)/*.mod
-	rm -f $(DATA_PREFIX)/icons/*