From 24a3c8d1bfca6a746137ff6e6d5658109079e09c Mon Sep 17 00:00:00 2001
From: parasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Date: Wed, 11 Jul 2007 16:47:51 +0000
Subject: [PATCH] Fixed a problem with Makefile.mingw where make wasn't
 rebuilding targets properly.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1036 78b8d119-cf0a-0410-b17c-f493084dd1d7
---
 Makefile       |    6 +++---
 Makefile.mingw |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e78cc2b..fbb726e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ CPPFLAGS := -DVERSION=\"$(VERSION)\" -Ishare $(CPPFLAGS)
 SDL_LIBS= $(shell sdl-config --libs)
 PNG_LIBS= $(shell libpng-config --libs)
 
-MAPC_TARG= mapc
-BALL_TARG= neverball
-PUTT_TARG= neverputt
+MAPC_TARG= mapc$(EXT)
+BALL_TARG= neverball$(EXT)
+PUTT_TARG= neverputt$(EXT)
 
 MAPC_EXEC= ./$(MAPC_TARG)
 
diff --git a/Makefile.mingw b/Makefile.mingw
index e943931..aed800e 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,18 +1,17 @@
-include Makefile
-
 #-----------------------------------------------------------------------------
 
-MAPC_TARG= mapc.exe
-BALL_TARG= neverball.exe
-PUTT_TARG= neverputt.exe
+EXT=.exe
+
+include Makefile
 
 MAPC_EXEC= wine $(MAPC_TARG)
 
 OGL_LIBS= -lm -lopengl32
 BASE_LIBS= $(LDFLAGS) -lSDL -lSDL_image -lintl
-LIBS := $(LDFLAGS) $(SDL_LIBS) -lSDL_image -lSDL_mixer -lSDL_ttf \
+LIBS= $(LDFLAGS) $(SDL_LIBS) -lSDL_image -lSDL_mixer -lSDL_ttf \
 	$(OGL_LIBS) $(PNG_LIBS) -lintl
 
+.PHONY: native
 native:
 	$(MAKE) -f Makefile.mingw MAPC_EXEC=$(MAPC_TARG)
 
@@ -67,3 +66,4 @@ convert-text-files: $(TXT_DOCS)
 	$(TODOS) $@
 
 #-----------------------------------------------------------------------------
+
-- 
1.7.9.5