Undid revisions 884 and 883, in effect removing the macosx directory.

[neverball] / Makefile

diff --git a/Makefile b/Makefile
index 38b41af..cee30c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@ CFLAGS= -Wall -g -O3 -ansi -pedantic $(shell sdl-config --cflags)
 #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
 
 SDL_LIBS= $(shell sdl-config --libs)
-FT2_LIBS= $(shell freetype-config --libs)
 
 MAPC_TARG= mapc
 MAPC_EXEC = ./$(MAPC_TARG)
@@ -110,7 +109,7 @@ PUTT_DEPS= $(PUTT_OBJS:.o=.d)
 MAPC_DEPS= $(MAPC_OBJS:.o=.d)
 
 BASE_LIBS= $(SDL_LIBS) -lSDL_image
-LIBS= $(X11_PATH) $(BASE_LIBS) -lSDL_ttf -lSDL_mixer $(FT2_LIBS) $(OGL_LIBS)
+LIBS= $(X11_PATH) $(BASE_LIBS) -lpng -lSDL_ttf -lSDL_mixer $(OGL_LIBS)
 
 MESSAGEPART= /LC_MESSAGES/$(LOCALEDOM).mo
 MESSAGES= $(LINGUAS:%=$(LOCALEDIR)/%$(MESSAGEPART))
@@ -126,8 +125,7 @@ LINGUAS= $(POS:po/%.po=%)
 #------------------------------------------------------------------------------
 
 %.d : %.c
-       $(CC) $(CFLAGS) -Ishare -MM -MF $@ $<
-       sed -i 's+^[^:]*:+$*.o $@ :+' $@
+       $(CC) $(CFLAGS) -Ishare -MM -MF $@ -MT '$*.o $@' $<
 
 %.o : %.c
        $(CC) $(CFLAGS) -Ishare -o $@ -c $<
@@ -170,6 +168,9 @@ clean : clean-src
 test : all
        ./neverball
 
+tools :
+       cd tools && $(MAKE)
+
 #------------------------------------------------------------------------------
 # PO update rules
 #------------------------------------------------------------------------------
@@ -188,6 +189,7 @@ po-update : po-update-extract po-update-merge
 #------------------------------------------------------------------------------
 
 .PHONY : all sols locales clean-src clean test \
-       po-update-extract po-update-merge po-update
+       po-update-extract po-update-merge po-update \
+       tools
 
 -include $(BALL_DEPS) $(PUTT_DEPS) $(MAPC_DEPS)