X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile;h=6ffba099dd2321c45d6eee29e3682a003fe5f7cd;hp=25b8200c8094f40d2a46b1e3909c4afd048a73ce;hb=a2af96e68b210b7c3db90b7ec474498c5611a3a7;hpb=dbca4f70bb870b839c5509928b8c749db304ecb8

diff --git a/Makefile b/Makefile
index 25b8200..6ffba09 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,12 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-VERSION=0.1
-PACKAGENAME=vor
-NEWD=$(PACKAGENAME)-$(VERSION)
-TMP=/tmp
-OPTIONS=-DVERSION=\"$(VERSION)\"
-SOUNDSOURCE=sound
+ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
+cflags := -g $(shell sdl-config --cflags) -Wall
 
-SOUNDLIBRARIES=-lSDL_mixer
-
-LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES)
+my_objects := sound.o file.o main.o
+libs := SFont.o
+objects := $(libs) $(my_objects)
 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -o games -g games
@@ -35,11 +31,15 @@ PROGRAM_PREFIX = /usr/games/bin
 
 all: vor
 
-.c.o:
-	cc -c -g $? `sdl-config --cflags` $(OPTIONS)
+%.o: %.c
+	$(CC) $(cflags) -c -o $@ $<
+
+$(my_objects): config.h
+
+main.o file.o: file.h
 
-vor:	SFont.o $(SOUNDSOURCE).o main.o
-	cc -o $@ $+ $(LIBRARIES)
+vor: $(objects)
+	$(CC) $(ldflags) -o $@ $^ $(LIBRARIES)
 
 clean:
 	rm -f *.o vor
@@ -62,8 +62,8 @@ install:	all
 	$(INSTALL_DATA) ./data/music/* $(DATA_PREFIX)/music/
 	$(INSTALL_DATA) ./data/sounds/* $(DATA_PREFIX)/sounds/
 	$(INSTALL_DATA) ./data/sprites/* $(DATA_PREFIX)/sprites/
-	touch $(DATA_PREFIX)/.highscore
-	chmod a+rw $(DATA_PREFIX)/.highscore
+	touch $(DATA_PREFIX)/scores
+	chmod a+rw $(DATA_PREFIX)/scores
 
 uninstall:
 	rm -f $(PROGRAM_PREFIX)/vor
@@ -74,7 +74,7 @@ uninstall:
 	rm -f $(DATA_PREFIX)/music/*
 	rm -f $(DATA_PREFIX)/sounds/*
 	rm -f $(DATA_PREFIX)/sprites/*
-	rm -f $(DATA_PREFIX)/.highscore
+	rm -f $(DATA_PREFIX)/scores $(DATA_PREFIX)/.highscore
 
 	if [ -d $(DATA_PREFIX)/banners ]; then rmdir $(DATA_PREFIX)/banners; fi
 	if [ -d $(DATA_PREFIX)/fonts ]; then rmdir $(DATA_PREFIX)/fonts; fi