Yay, I'm in the AUTHORS file too!

[neverball] / Makefile

diff --git a/Makefile b/Makefile
index de2a853..21d4ed6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,11 +149,10 @@ BALL_OBJS := \
        share/tilt.o        \
        share/common.o      \
        ball/hud.o          \
-       ball/mode.o         \
        ball/game.o         \
        ball/score.o        \
        ball/level.o        \
-       ball/levels.o       \
+       ball/progress.o     \
        ball/set.o          \
        ball/demo.o         \
        ball/util.o         \
@@ -293,7 +292,7 @@ TXT_DOCS := $(TEXT_DOCS:%=%.txt)
 .PHONY: setup
 setup: $(INSTALLER)
 
-$(INSTALLER): install-dlls convert-text-files all tools
+$(INSTALLER): install-dlls convert-text-files all contrib
        $(MAKENSIS) $(MAKENSIS_FLAGS) -nocd scripts/neverball.nsi
 
 $(INSTALLER): LDFLAGS := -s $(LDFLAGS)
@@ -302,7 +301,7 @@ $(INSTALLER): LDFLAGS := -s $(LDFLAGS)
 clean-setup: clean
        $(RM) install-dlls.sh *.dll $(TXT_DOCS)
        find data -name "*.txt" -exec $(FROMDOS) {} \;
-       $(MAKE) -C tools EXT=$(EXT) clean
+       $(MAKE) -C contrib EXT=$(EXT) clean
 
 #------------------------------------------------------------------------------
 
@@ -333,9 +332,9 @@ convert-text-files: $(TXT_DOCS)
 
 #------------------------------------------------------------------------------
 
-.PHONY: tools
-tools:
-       $(MAKE) -C tools EXT=$(EXT)
+.PHONY: contrib
+contrib:
+       $(MAKE) -C contrib EXT=$(EXT)
 
 #------------------------------------------------------------------------------