# HG changeset patch
# User John "Elwin" Edwards
# Date 1457743672 18000
# Node ID 837044d2c362b89ea070c916d04a8058aea8fcad
# Parent  bac2c81fec78f1a4b3210292ed9d300144adff95# Parent  e1cd27c5464f2e0f345db9c7839997e7dbf1018c
Merge the GCC5 and build fix branches.

This fixes all warnings produced by GCC 5, except the ones related to
system functions.  Those could be fixed by including the proper headers,
but it would be better to replace the system-dependent code with
functions from mdport.c.

diff -r e1cd27c5464f -r 837044d2c362 arogue5/Makefile.in
--- a/arogue5/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/arogue5/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -51,18 +51,21 @@
 MISC=	Makefile LICENSE.TXT arogue58.sln arogue58.vcproj
 DOCS= arogue58.doc arogue58.html
 
-CC    = gcc
+CC    = @CC@
 CPPFLAGS =@DEFS@
 CFLAGS=
 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 -r e1cd27c5464f -r 837044d2c362 arogue7/Makefile.in
--- a/arogue7/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/arogue7/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -61,7 +61,7 @@
 MISC  =	Makefile $(MISC_C) LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj $(DOCS)\
         $(DOCSRC)
 
-CC    = gcc
+CC    = @CC@
 CPPFLAGS =@DEFS@
 ROPTS =
 COPTS =
@@ -74,11 +74,14 @@
 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 -r e1cd27c5464f -r 837044d2c362 rogue3/Makefile.in
--- a/rogue3/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/rogue3/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -53,7 +53,7 @@
 MISC  =	Makefile $(MISC_C) $(PROGRAM).sln $(PROGRAM).vcproj $(RAWDOCS) $(DOCS)\
 	$(DOCSRC)
 
-CC    = gcc
+CC    = @CC@
 CPPFLAGS =@DEFS@
 ROPTS =
 COPTS =
@@ -68,11 +68,14 @@
 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 -r e1cd27c5464f -r 837044d2c362 rogue4/Makefile.in
--- a/rogue4/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/rogue4/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -68,6 +68,8 @@
 #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 -r e1cd27c5464f -r 837044d2c362 rogue5/Makefile.in
--- a/rogue5/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/rogue5/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -123,7 +123,7 @@
 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
@@ -142,8 +142,7 @@
 	$(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe
 	$(RM) $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip 
 	$(RM) $(DOCS)
-	$(RM) $(DISTNAME)/*
-	-rmdir $(DISTNAME)
+	$(RM) -r $(DISTNAME)
     
 maintainer-clean:
 	$(RM) config.h
diff -r e1cd27c5464f -r 837044d2c362 srogue/Makefile.in
--- a/srogue/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/srogue/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -42,7 +42,7 @@
 DOCS=	$(PROGRAM).doc
 MISC=	Makefile LICENSE.TXT rogue.nr
 
-CC    = gcc
+CC    = @CC@
 CFLAGS=
 CPPFLAGS=@DEFS@
 CRLIB = @LIBS@
@@ -59,6 +59,11 @@
 $(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 -r e1cd27c5464f -r 837044d2c362 xrogue/Makefile.in
--- a/xrogue/Makefile.in	Fri Mar 11 17:40:00 2016 -0500
+++ b/xrogue/Makefile.in	Fri Mar 11 19:47:52 2016 -0500
@@ -50,18 +50,21 @@
 
 MISC  = Makefile README.TXT LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj
 
-CC    = gcc
+CC    = @CC@
 CPPFLAGS =@DEFS@
 CFLAGS=
 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 $@