Fixed problem with sfrotz needlessly recompiling.

Something about a header file names "defines.h" causes it to never
be up-to-date?  So I changed it to "defs.h".

diff --git a/Makefile b/Makefile
index 03972cddc4f8c3304bcdd01da79eb1c1ef932a30..c2195148564741c7c2557747b54a9f48d7a8512a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,12 +113,12 @@ SRCDIR = src
 COMMON_DIR = $(SRCDIR)/common
 COMMON_LIB = $(COMMON_DIR)/frotz_common.a
 COMMON_STRINGS = $(COMMON_DIR)/version.c
-COMMON_DEFINES = $(COMMON_DIR)/defines.h
+COMMON_DEFINES = $(COMMON_DIR)/defs.h
 HASH = $(COMMON_DIR)/git_hash.h
 
 CURSES_DIR = $(SRCDIR)/curses
 CURSES_LIB = $(CURSES_DIR)/frotz_curses.a
-CURSES_DEFINES = $(CURSES_DIR)/defines.h
+CURSES_DEFINES = $(CURSES_DIR)/ux_defines.h
 
 DUMB_DIR = $(SRCDIR)/dumb
 DUMB_LIB = $(DUMB_DIR)/frotz_dumb.a

diff --git a/src/common/frotz.h b/src/common/frotz.h
index fb1eb342e53d0a6143cb72f28032fd9c8ac5546f..6883e289a28ade5d47041f37845d3b6bc1c1da20 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -125,7 +125,7 @@ typedef struct {
 
 
 #include "setup.h"
-#include "defines.h"
+#include "defs.h"
 #include "missing.h"
 #include "unused.h"
 

diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h
index 25fe4a75e130bb9061ab9a4cbaff22e1d6493b4f..1e87b3fce380a4daea14cf298c5a49ea58ecb447 100644 (file)
--- a/src/curses/ux_frotz.h
+++ b/src/curses/ux_frotz.h
@@ -10,11 +10,11 @@
 
 #include <signal.h>
 
-#include "defines.h"
 #include "../common/frotz.h"
 #include "../blorb/blorb.h"
 #include "../blorb/blorblow.h"
 #include "ux_setup.h"
+#include "ux_defines.h"
 
 #define MASTER_CONFIG          "frotz.conf"
 #define USER_CONFIG            ".frotzrc"