From 1bc8ffdb15a55915045fe7dd4256f61cf49b5c2f Mon Sep 17 00:00:00 2001
From: sezero <sezero@af15c1b1-3010-417e-b628-4374ebc0bcbd>
Date: Fri, 9 Mar 2012 10:11:09 +0000
Subject: [PATCH] minor Makefile tidying

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@642 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/Makefile        | 8 ++++----
 Quake/Makefile.darwin | 8 ++++----
 Quake/Makefile.w32    | 6 +++---
 Quake/Makefile.w64    | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Quake/Makefile b/Quake/Makefile
index c66e6c8b..6c10d3d8 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -1,4 +1,4 @@
-### GNU Makefile for QuakeSpasm unix targets, Dec. 27, 2011
+### GNU Makefile for QuakeSpasm unix targets, March 09, 2012
 #
 # You need the SDL library fully installed.
 # "make DEBUG=1" to build a debug client.
@@ -32,7 +32,7 @@ SDLNET   ?= 0
 
 BUILDDIR := .
 
-SYSNAME := $(shell uname -s) 
+SYSNAME := $(shell uname -s)
 
 ifneq (,$(findstring MINGW32,$(SYSNAME)))
 HOST_OS = WIN32
@@ -54,7 +54,7 @@ endif
 endif
 
 # ---------------------------------------
-# Define some build variables
+# build variables
 # ---------------------------------------
 
 CC ?= gcc
@@ -268,7 +268,7 @@ OBJS := strlcat.o \
 	$(SYSOBJ_SYS) $(SYSOBJ_MAIN) $(SYSOBJ_RES)
 
 # ------------------------
-# build rules for Linux
+# Linux build rules
 # ------------------------
 
 quakespasm:	$(OBJS)
diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
index d75d0ef5..2bb9769a 100644
--- a/Quake/Makefile.darwin
+++ b/Quake/Makefile.darwin
@@ -1,4 +1,4 @@
-### GNU Makefile for QuakeSpasm for Darwin, Dec. 27, 2011
+### GNU Makefile for QuakeSpasm for Darwin, March 09, 2012
 
 # Usage: "make -f Makefile.darwin"
 #
@@ -47,7 +47,7 @@ SDLNET   ?= 0
 
 BUILDDIR := .
 
-SYSNAME := $(shell uname -s) 
+SYSNAME := $(shell uname -s)
 
 ifneq (,$(findstring MINGW32,$(SYSNAME)))
 HOST_OS = WIN32
@@ -75,7 +75,7 @@ endif
 endif
 
 # ---------------------------------------
-# Define some build variables
+# build variables
 # ---------------------------------------
 
 CC ?= gcc
@@ -294,7 +294,7 @@ OBJS := strlcat.o \
 	$(SYSOBJ_SYS) $(SYSOBJ_MAIN) $(SYSOBJ_RES)
 
 # ------------------------
-# build rules for Linux
+# darwin build rules
 # ------------------------
 
 quakespasm:	$(OBJS)
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index 0a4e2a62..ae2a6a6a 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -1,5 +1,5 @@
 # GNU Makefile for cross-compiling quakespasm.exe (Win32 : MinGW)
-# using cross-toolchains on a linux host	/ Dec. 27, 2011.
+# using cross-toolchains on a linux host	/ March 09, 2012
 # "make DEBUG=1" to build a debug client.
 # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations.
 # "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1.
@@ -34,7 +34,7 @@ SDLNET   ?= 0
 TOPDIR := $(shell pwd)
 
 # ---------------------------------------
-# Define some build variables
+# build variables
 # ---------------------------------------
 
 TARGET=i686-pc-mingw32
@@ -254,7 +254,7 @@ OBJS := strlcat.o \
 	$(SYSOBJ_SYS) $(SYSOBJ_MAIN) $(SYSOBJ_RES)
 
 # ------------------------
-# build rules for mingw :
+# MinGW build rules
 # ------------------------
 
 quakespasm.exe:	$(OBJS)
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index 5c8bac81..80bb7c17 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -1,5 +1,5 @@
 # GNU Makefile for cross-compiling quakespasm.exe (Win64 : MinGW-w64)
-# using cross-toolchains on a linux host	/ Dec. 27, 2011.
+# using cross-toolchains on a linux host	/ March 09, 2012
 # "make DEBUG=1" to build a debug client.
 # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations.
 # "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT recommended).
@@ -34,7 +34,7 @@ SDLNET   ?= 0
 TOPDIR := $(shell pwd)
 
 # ---------------------------------------
-# Define some build variables
+# build variables
 # ---------------------------------------
 
 TARGET=x86_64-w64-mingw32
@@ -254,11 +254,11 @@ OBJS := strlcat.o \
 	$(SYSOBJ_SYS) $(SYSOBJ_MAIN) $(SYSOBJ_RES)
 
 # ------------------------
-# build rules for mingw-w64 :
+# MinGW-w64 build rules
 # ------------------------
 
 quakespasm.exe:	$(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(SDL_LIBS) -o $@
+	$(CC) $(OBJS) $(LIBS) $(SDL_LIBS) -o $@
 	$(call do_strip,$@)
 
 release:	quakespasm.exe