From 69a7bcafc71271f79bc65d33411591473d21456f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
Date: Fri, 7 Aug 2009 15:39:51 +0200
Subject: [PATCH] Fix makefiles

---
 Makefile               |  4 ++--
 Makefile.osx           | 17 +++++++++--------
 Makefile.sdldemoswin32 |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 3759586..cba6ad7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ sdlbomber: bomber.o gfx.o sound.o announce.o
 
 matcher: matcher.c
 
-bomber.o: bomber.c bomber.h gfx.h announce.h
+bomber.o: bomber.c bomber.h gfx.h announce.h sound.h
 
 gfx.o: gfx.c gfx.h bomber.h
 
-sound.o: sound.c
+sound.o: sound.c sound.h
 
 announce.o: announce.c announce.h
 
diff --git a/Makefile.osx b/Makefile.osx
index 8bd267f..e29725c 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -3,23 +3,24 @@
 CC	= gcc
 CFLAGS = -O2 -Wall -I/Library/Frameworks/SDL.framework/Headers $(DBG)
 
-LDFLAGS += -framework SDL -framework Cocoa -o $@
+LDFLAGS += -framework SDL -framework Cocoa -o $@ -lavahi-client
 
 
-all: bomber
-bomber: gfx.o bomber.o sound.o SDLMain.o
+all: sdlbomber
+sdlbomber: gfx.o bomber.o sound.o SDLMain.o announce.o
 
 
 SDLMain.o: SDLmain.m
-bomber.o: bomber.c bomber.h gfx.h
+bomber.o: bomber.c bomber.h gfx.h sound.h announce.h
 gfx.o: gfx.c bomber.h gfx.h
-sound.o: sound.c bomber.h
+sound.o: sound.c bomber.h sound.h
+announce.o: announce.c announce.h
 
 clean:
-	rm -f *.o bomber
+	rm -f *.o sdlbomber matcher
 
-test:	all
-	./bomber
+test: all
+	./sdlbomber
 
 
 
diff --git a/Makefile.sdldemoswin32 b/Makefile.sdldemoswin32
index 1f74b2c..b158abf 100644
--- a/Makefile.sdldemoswin32
+++ b/Makefile.sdldemoswin32
@@ -1,9 +1,9 @@
 # Makefile for bomber
 #
 
-TARGET = bomber
+TARGET = sdlbomber
 USEINET = true
 
 include ../GNUmake
 
-$(TARGET): bomber.o gfx.o sound.o
+$(TARGET): bomber.o gfx.o sound.o announce.o