From e30aa0e491aab3f36d6690d12218bff497e06071 Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Tue, 8 Mar 2016 19:45:41 -0500
Subject: [PATCH] Makefiles: don't rely on built-in implicit rules.

Not all make implementations will use CPPFLAGS when compiling C files.
---
 arogue5/Makefile.in | 5 ++++-
 arogue7/Makefile.in | 5 ++++-
 rogue3/Makefile.in  | 5 ++++-
 rogue4/Makefile.in  | 2 ++
 rogue5/Makefile.in  | 2 +-
 srogue/Makefile.in  | 5 +++++
 xrogue/Makefile.in  | 5 ++++-
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/arogue5/Makefile.in b/arogue5/Makefile.in
index 0a34c87..791be65 100644
--- a/arogue5/Makefile.in
+++ b/arogue5/Makefile.in
@@ -58,11 +58,14 @@ CRLIB = @LIBS@
 RM    = rm -f
 TAR   = tar
 INSTALL=@INSTALL@
-.SUFFIXES: .obj
+.SUFFIXES: .obj .o .c
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
 
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+
 $(PROGRAM): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
 
diff --git a/arogue7/Makefile.in b/arogue7/Makefile.in
index b38c967..27fc348 100644
--- a/arogue7/Makefile.in
+++ b/arogue7/Makefile.in
@@ -74,11 +74,14 @@ NROFF=@NROFF@
 COLCRT=@COLCRT@
 TBL=@TBL@
 
-.SUFFIXES: .obj
+.SUFFIXES: .obj .o .c
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
     
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+
 all: $(PROGRAM) docs
 
 $(PROGRAM): $(HDRS) $(OBJS)
diff --git a/rogue3/Makefile.in b/rogue3/Makefile.in
index 312da15..1b00194 100644
--- a/rogue3/Makefile.in
+++ b/rogue3/Makefile.in
@@ -68,11 +68,14 @@ NROFF=@NROFF@
 COLCRT=@COLCRT@
 TBL=@TBL@
 
-.SUFFIXES: .obj
+.SUFFIXES: .obj .o .c
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
 
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $*.o $*.c
+
 all: $(PROGRAM)$(EXE) docs
 
 $(PROGRAM)$(EXE): $(HDRS) $(OBJS)
diff --git a/rogue4/Makefile.in b/rogue4/Makefile.in
index 2a03fa7..8e3e685 100644
--- a/rogue4/Makefile.in
+++ b/rogue4/Makefile.in
@@ -68,6 +68,8 @@ NL=
 #MACHDEP=	-DMAXLOAD=40 -DLOADAV -DCHECKTIME=4
 MACHDEP=
 
+.SUFFIXES: .c .o
+
 .c.o:
 	@echo $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
 	@$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c -o $*.o
diff --git a/rogue5/Makefile.in b/rogue5/Makefile.in
index f9181ae..233037c 100644
--- a/rogue5/Makefile.in
+++ b/rogue5/Makefile.in
@@ -123,7 +123,7 @@ AFILES   = configure Makefile.in configure.ac config.h.in config.sub config.gues
 MISC     = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \
            rogue.png rogue.desktop
 
-.SUFFIXES: .obj
+.SUFFIXES: .obj .o .c
 
 .c.obj:
 	$(CC) $(CFLAGS) $(CPPFLAGS) /c $*.c
diff --git a/srogue/Makefile.in b/srogue/Makefile.in
index 86363ae..c44fff4 100644
--- a/srogue/Makefile.in
+++ b/srogue/Makefile.in
@@ -59,6 +59,11 @@ all: $(PROGRAM) docs
 $(PROGRAM): $(HDRS) $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
 
+.SUFFIXES: .c .o
+
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+
 tags: $(HDRS) $(CFILES)
 	ctags -u $?
 	ed - tags < :ctfix
diff --git a/xrogue/Makefile.in b/xrogue/Makefile.in
index 5c8f2e1..b7a7e80 100644
--- a/xrogue/Makefile.in
+++ b/xrogue/Makefile.in
@@ -57,11 +57,14 @@ LIBS  = @LIBS@
 RM    = rm -f
 TAR   = tar 
 INSTALL=@INSTALL@
-.SUFFIXES: .obj
+.SUFFIXES: .obj .o .c
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
 
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+
 $(PROGRAM): $(HDRS) $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@