Yay, I'm in the AUTHORS file too!

[neverball] / Makefile

diff --git a/Makefile b/Makefile
index 7ce23f3..21d4ed6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,8 +125,6 @@ MAPC_OBJS := \
        share/solid.o       \
        share/binary.o      \
        share/base_config.o \
-       share/config.o      \
-       share/sync.o        \
        share/mapc.o
 BALL_OBJS := \
        share/lang.o        \
@@ -201,7 +199,6 @@ PUTT_OBJS := \
        putt/hole.o         \
        putt/course.o       \
        putt/st_all.o       \
-    putt/st_balt.o      \
        putt/st_conf.o      \
        putt/main.o
 
@@ -232,7 +229,7 @@ $(PUTT_TARG) : $(PUTT_OBJS)
        $(CC) $(ALL_CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
 
 $(MAPC_TARG) : $(MAPC_OBJS)
-       $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(ALL_LIBS)
+       $(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(BASE_LIBS)
 
 # Work around some extremely helpful sdl-config scripts.
 
@@ -295,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)
@@ -304,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
 
 #------------------------------------------------------------------------------
 
@@ -335,9 +332,9 @@ convert-text-files: $(TXT_DOCS)
 
 #------------------------------------------------------------------------------
 
-.PHONY: tools
-tools:
-       $(MAKE) -C tools EXT=$(EXT)
+.PHONY: contrib
+contrib:
+       $(MAKE) -C contrib EXT=$(EXT)
 
 #------------------------------------------------------------------------------