Edited includes to finish fixing #17

diff --git a/interpreters/frotz/Makefile.am b/interpreters/frotz/Makefile.am
index ce114453b3e75c32260352d55b0f9b27c0369bb4..82f9c28237205eac07e653e6d8cd0668535d9fc5 100644 (file)
--- a/interpreters/frotz/Makefile.am
+++ b/interpreters/frotz/Makefile.am
@@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = frotz.la
 frotz_la_SOURCES = buffer.c err.c fastmem.c files.c input.c main.c math.c \
        object.c process.c quetzal.c random.c redirect.c sound.c stream.c table.c \
        text.c variable.c glkscreen.c glkmisc.c frotz.h glkfrotz.h glkio.h setup.h
-frotz_la_CPPFLAGS = -I$(top_srcdir)
+frotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara
 frotz_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 frotzdocdir = $(datadir)/doc/$(PACKAGE)/frotz

diff --git a/interpreters/frotz/fastmem.c b/interpreters/frotz/fastmem.c
index fa4394b6507c0c035da8c91079af1cf56aadc540..113c50cb5580e549b7dc5988a72f64fe39eeefb1 100644 (file)
--- a/interpreters/frotz/fastmem.c
+++ b/interpreters/frotz/fastmem.c
@@ -28,10 +28,10 @@
 
 #include "frotz.h"
 
-#include <libchimara/glk.h>
+#include "glk.h"
 #include "glkio.h"
-#include <libchimara/glkstart.h>
-#include <libchimara/gi_blorb.h>
+#include "glkstart.h"
+#include "gi_blorb.h"
 
 extern void seed_random (int);
 extern void restart_screen (void);

diff --git a/interpreters/frotz/files.c b/interpreters/frotz/files.c
index fd226315c2d73c3a1278df98532082eccd70ec27..6ed8c3371a67e5897680a7e5c95c9dda90f41059 100644 (file)
--- a/interpreters/frotz/files.c
+++ b/interpreters/frotz/files.c
@@ -19,7 +19,7 @@
  */
 
 #include "frotz.h"
-#include <libchimara/glk.h>
+#include "glk.h"
 #include "glkio.h"
 
 extern void set_more_prompts (bool);

diff --git a/interpreters/frotz/glkfrotz.h b/interpreters/frotz/glkfrotz.h
index 471953ee71a5faaf567f65027f768851e763a523..0f8ff4bead4d6c1a3b03f16ed60bb2a3635bafaf 100644 (file)
--- a/interpreters/frotz/glkfrotz.h
+++ b/interpreters/frotz/glkfrotz.h
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <libchimara/glk.h>
+#include "glk.h"
 
 extern int curr_status_ht;
 extern int mach_status_ht;

diff --git a/interpreters/frotz/main.c b/interpreters/frotz/main.c
index 6ac7aa0cfbc50ffea0fade0d13ad700151fce552..a403c1303bde61eb167cb86ba5f1330478becbf7 100644 (file)
--- a/interpreters/frotz/main.c
+++ b/interpreters/frotz/main.c
@@ -163,8 +163,8 @@ void z_piracy (void)
  *
  */
 
-#include <libchimara/glk.h>
-#include <libchimara/glkstart.h>
+#include "glk.h"
+#include "glkstart.h"
 
 static int myargc;
 static char **myargv;

diff --git a/interpreters/frotz/quetzal.c b/interpreters/frotz/quetzal.c
index afc2e0eb6985c891244642021b285a420d9b1263..e41a57b577a759238a23ce2fb75bb2ca77661d90 100644 (file)
--- a/interpreters/frotz/quetzal.c
+++ b/interpreters/frotz/quetzal.c
@@ -19,7 +19,7 @@
  */
 
 #include "frotz.h"
-#include <libchimara/glk.h>
+#include "glk.h"
 #include "glkio.h"
 
 #define get_c fgetc

diff --git a/interpreters/nitfol/Makefile.am b/interpreters/nitfol/Makefile.am
index 2a27a0c7307b95ced8c4e47e25a9e0fa56e45f1c..23b9398f5c5588a5a2a17929899653565521019b 100644 (file)
--- a/interpreters/nitfol/Makefile.am
+++ b/interpreters/nitfol/Makefile.am
@@ -23,7 +23,8 @@ nitfol_la_SOURCES = automap.c automap.h binary.h copying.h debug.c debug.h \
        $(BLORB) \
        $(SOUND)
 nodist_nitfol_la_SOURCES = copying.c dbg_help.h startunix.c
-nitfol_la_CPPFLAGS = -I$(top_srcdir) -DSMART_TOKENISER -DUSE_INLINE
+nitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \
+       -DSMART_TOKENISER -DUSE_INLINE
 nitfol_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 info_TEXINFOS = nitfol.texi

diff --git a/interpreters/nitfol/blorb.c b/interpreters/nitfol/blorb.c
index a83068bb8e34aa2d3e745fe34d93982a2594fb65..aedb96fa3d1495f5618a08df2cd45367c1d9d703 100644 (file)
--- a/interpreters/nitfol/blorb.c
+++ b/interpreters/nitfol/blorb.c
@@ -1,5 +1,5 @@
 #include "nitfol.h"
-#include <libchimara/gi_blorb.h>
+#include "gi_blorb.h"
 
 /* Link this in only if your glk supports blorb */
 

diff --git a/interpreters/nitfol/main.c b/interpreters/nitfol/main.c
index cbd8cdeac9b1996059b6101c955f4a9cdcdb9a96..ce0ceacc949528b71c544b761238486f31363cf0 100644 (file)
--- a/interpreters/nitfol/main.c
+++ b/interpreters/nitfol/main.c
@@ -19,7 +19,7 @@
 */
 #include "nitfol.h"
 
-#include <libchimara/gi_blorb.h>
+#include "gi_blorb.h"
 
 
 static void set_zfile(strid_t file)

diff --git a/interpreters/nitfol/nitfol.h b/interpreters/nitfol/nitfol.h
index 7aa50ed1c63c0b64030235be23b4a144d2cb3255..319a5360c0787652354f0f9418fc5172f9c0ef1d 100644 (file)
--- a/interpreters/nitfol/nitfol.h
+++ b/interpreters/nitfol/nitfol.h
@@ -24,7 +24,7 @@
 #include <time.h>        /* For time() */
 #include <ctype.h>       /* for isspace, isgraph, etc. */
 #include <limits.h>
-#include <libchimara/glk.h>
+#include "glk.h"
 #define GLK_EOF ((glsi32) -1)
 
 #define NITFOL_MAJOR 0
@@ -328,7 +328,7 @@ typedef enum { OBJ_GET_INFO, OBJ_RECEIVE, OBJ_MOVE } watchinfo;
 #include "z_io.h"
 
 #include "no_snd.h"
-#include <libchimara/gi_blorb.h>
+#include "gi_blorb.h"
 #include "no_graph.h"
 #include "no_blorb.h"
 

diff --git a/interpreters/nitfol/nitfol.info b/interpreters/nitfol/nitfol.info
index fba02ccb6def5957948a54cd73297d307793158d..26970799e6e5888b5512321d53c221a859b65613 100644 (file)
--- a/interpreters/nitfol/nitfol.info
+++ b/interpreters/nitfol/nitfol.info
@@ -1,5 +1,4 @@
-This is ../../../interpreters/nitfol/nitfol.info, produced by makeinfo
-version 4.13 from ../../../interpreters/nitfol/nitfol.texi.
+This is nitfol.info, produced by makeinfo version 4.13 from nitfol.texi.
 
 INFO-DIR-SECTION Games
 START-INFO-DIR-ENTRY
@@ -1057,20 +1056,20 @@ File: nitfol.info,  Node: Games Cited,  Prev: Thanks,  Up: Top
 
 \1f
 Tag Table:
-Node: Top\7f263
-Node: Invoking nitfol\7f1602
-Node: Features\7f8478
-Node: Preferences\7f9127
-Node: Infinite undo/redo\7f10483
-Node: Aliases\7f11257
-Node: Abbreviation Expansion\7f13781
-Node: Typo correction\7f14898
-Node: Automapping\7f16812
-Node: Quetzal\7f22591
-Node: Blorb\7f24312
-Node: Debugger\7f24738
-Node: Bugs\7f31713
-Node: Thanks\7f34768
-Node: Games Cited\7f35184
+Node: Top\7f205
+Node: Invoking nitfol\7f1544
+Node: Features\7f8420
+Node: Preferences\7f9069
+Node: Infinite undo/redo\7f10425
+Node: Aliases\7f11199
+Node: Abbreviation Expansion\7f13723
+Node: Typo correction\7f14840
+Node: Automapping\7f16754
+Node: Quetzal\7f22533
+Node: Blorb\7f24254
+Node: Debugger\7f24680
+Node: Bugs\7f31655
+Node: Thanks\7f34710
+Node: Games Cited\7f35126
 \1f
 End Tag Table

diff --git a/interpreters/nitfol/no_blorb.c b/interpreters/nitfol/no_blorb.c
index 4f1e122f5f06150ed8a5ad897b8bd2922128afb9..0798545d2570e4b91d523e6550a731fc754fc1f8 100644 (file)
--- a/interpreters/nitfol/no_blorb.c
+++ b/interpreters/nitfol/no_blorb.c
@@ -1,5 +1,5 @@
 #include "nitfol.h"
-#include <libchimara/gi_blorb.h>
+#include "gi_blorb.h"
 
 /* Link this in only if your glk doesn't support blorb */
 

diff --git a/interpreters/nitfol/opt2glkc.pl b/interpreters/nitfol/opt2glkc.pl
index 96a9b41641d3d0281075b4e4bed305e58c7df111..6f60a644270b437fa54fc64553cafa7eef329307 100644 (file)
--- a/interpreters/nitfol/opt2glkc.pl
+++ b/interpreters/nitfol/opt2glkc.pl
@@ -236,7 +236,7 @@ sub make_glk_unix
 #include <dirent.h>
 #include <limits.h>
 #include \"$header\"
-#include <libchimara/glkstart.h>
+#include \"glkstart.h\"
 
 static char *game_filename = NULL;