From c10c22de041f1abb4550302930a90af19914f2a4 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Fri, 28 Sep 2012 15:57:09 +0200 Subject: [PATCH] Build interpreter plugins with a single Makefile This is to facilitate linking them with the libpeas plugin library and making .plugin description files for them, while keeping the interpreter source trees as close to Gargoyle as possible. --- configure.ac | 5 - interpreters/Makefile.am | 145 +++++++++++- interpreters/bocfel.patch | 44 ++++ interpreters/bocfel/Makefile.am | 15 -- interpreters/frotz.patch | 40 +--- interpreters/frotz/Makefile.am | 12 - interpreters/git.patch | 193 ---------------- interpreters/git/Makefile.am | 48 ---- interpreters/glulxe/Makefile.am | 20 -- interpreters/nitfol.patch | 389 -------------------------------- interpreters/nitfol/Makefile.am | 59 ----- 11 files changed, 197 insertions(+), 773 deletions(-) create mode 100644 interpreters/bocfel.patch delete mode 100644 interpreters/bocfel/Makefile.am delete mode 100644 interpreters/frotz/Makefile.am delete mode 100644 interpreters/git.patch delete mode 100644 interpreters/git/Makefile.am delete mode 100644 interpreters/glulxe/Makefile.am delete mode 100644 interpreters/nitfol.patch delete mode 100644 interpreters/nitfol/Makefile.am diff --git a/configure.ac b/configure.ac index 54b947f..c888d09 100644 --- a/configure.ac +++ b/configure.ac @@ -165,11 +165,6 @@ chimara-plugin.pc chimara.spec libchimara/Makefile interpreters/Makefile -interpreters/frotz/Makefile -interpreters/nitfol/Makefile -interpreters/glulxe/Makefile -interpreters/git/Makefile -interpreters/bocfel/Makefile tests/Makefile player/Makefile player/config.py diff --git a/interpreters/Makefile.am b/interpreters/Makefile.am index cd8e930..aa12431 100644 --- a/interpreters/Makefile.am +++ b/interpreters/Makefile.am @@ -1,3 +1,146 @@ -SUBDIRS=nitfol frotz glulxe git bocfel +# All plugins + +pkglib_LTLIBRARIES = bocfel.la frotz.la git.la glulxe.la nitfol.la +CLEANFILES = + +# Bocfel + +bocfel_la_SOURCES = bocfel/blorb.c bocfel/blorb.h bocfel/branch.c \ + bocfel/branch.h bocfel/dict.c bocfel/dict.h bocfel/glkstart.c bocfel/iff.c \ + bocfel/iff.h bocfel/io.c bocfel/io.h bocfel/math.c bocfel/math.h \ + bocfel/memory.c bocfel/memory.h bocfel/objects.c bocfel/objects.h \ + bocfel/osdep.c bocfel/osdep.h bocfel/process.c bocfel/process.h \ + bocfel/random.c bocfel/random.h bocfel/screen.c bocfel/screen.h \ + bocfel/stack.c bocfel/stack.h bocfel/table.c bocfel/table.h \ + bocfel/unicode.c bocfel/unicode.h bocfel/util.c bocfel/util.h \ + bocfel/zoom.c bocfel/zoom.h bocfel/zterp.c bocfel/zterp.h +bocfel_la_CPPFLAGS = -DZTERP_GLK -DZTERP_UNIX \ + -I$(top_srcdir) -I$(top_srcdir)/libchimara +bocfel_la_CFLAGS = -std=c99 $(AM_CFLAGS) +bocfel_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) + +# Frotz + +frotz_la_SOURCES = frotz/buffer.c frotz/err.c frotz/fastmem.c frotz/files.c \ + frotz/input.c frotz/main.c frotz/math.c frotz/object.c frotz/process.c \ + frotz/quetzal.c frotz/random.c frotz/redirect.c frotz/sound.c \ + frotz/stream.c frotz/table.c frotz/text.c frotz/variable.c \ + frotz/glkscreen.c frotz/glkmisc.c frotz/frotz.h frotz/glkfrotz.h \ + frotz/glkio.h +frotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara +frotz_la_CFLAGS = -Wno-pointer-sign $(AM_CFLAGS) +frotz_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) + +# Git + +git_la_SOURCES = git/version.h git/git.h git/config.h git/compiler.h \ + git/memory.h git/opcodes.h git/labels.inc git/compiler.c git/gestalt.c \ + git/git.c git/git_unix.c git/glkop.c git/heap.c git/memory.c git/opcodes.c \ + git/operands.c git/peephole.c git/savefile.c git/saveundo.c git/search.c \ + git/terp.c git/accel.c +git_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara +git_la_CFLAGS = -DCHIMARA_EXTENSIONS -DUSE_INLINE $(AM_CFLAGS) +git_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) +# Memory mapping (-DUSE_MMAP) doesn't seem to work... FIXME + +CLEANFILES += git/test/*.tmp + +# Glulxe + +glulxe_la_SOURCES = glulxe/accel.c glulxe/exec.c glulxe/files.c glulxe/funcs.c \ + glulxe/gestalt.c glulxe/gestalt.h glulxe/glkop.c glulxe/glulxe.h \ + glulxe/heap.c glulxe/main.c glulxe/opcodes.h glulxe/operand.c \ + glulxe/osdepend.c glulxe/profile.c glulxe/search.c glulxe/serial.c \ + glulxe/string.c glulxe/unixstrt.c glulxe/vm.c glulxe/float.c +glulxe_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -DOS_UNIX +glulxe_la_CFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-unused \ + $(AM_CFLAGS) +glulxe_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) + +#noinst_PROGRAMS = glulxdump +#glulxdump_SOURCES = glulxe/glulxdump.c +#glulxdump_CPPFLAGS = -I$(top_srcdir)/src/libchimara +#glulxdump_LDADD = ../libchimara/libchimara.la + +dist_pkglibexec_SCRIPTS = glulxe/profile-analyze.py + +# Nitfol + +NITFOL_GRAPHICS = nitfol/graphics.c nitfol/graphics.h +NITFOL_BLORB = nitfol/blorb.c +NITFOL_SOUND = nitfol/sound.c nitfol/sound.h +# NITFOL_GRAPHICS = nitfol/no_graph.c nitfol/no_graph.h +# NITFOL_BLORB = nitfol/no_blorb.c +# NITFOL_SOUND = nitfol/no_snd.c nitfol/no_snd.h +# no_blorb.h is apparently the header file for both blorb.c and no_blorb.c + +dist_noinst_SCRIPTS = nitfol/copying.awk nitfol/opt2glkc.pl nitfol/y2help.pl + +nitfol_la_SOURCES = nitfol/automap.c nitfol/automap.h nitfol/binary.h \ + nitfol/copying.h nitfol/debug.c nitfol/debug.h nitfol/decode.c \ + nitfol/decode.h nitfol/errmesg.c nitfol/errmesg.h nitfol/globals.c \ + nitfol/globals.h nitfol/hash.c nitfol/hash.h nitfol/iff.c nitfol/iff.h \ + nitfol/infix.c nitfol/infix.h nitfol/inform.y nitfol/inform.h \ + nitfol/init.c nitfol/init.h nitfol/io.c nitfol/nio.h nitfol/linkevil.h \ + nitfol/main.c nitfol/main.h nitfol/nitfol.h nitfol/no_blorb.h \ + nitfol/objects.c nitfol/objects.h nitfol/op_call.c nitfol/op_call.h \ + nitfol/op_jmp.c nitfol/op_jmp.h nitfol/oplist.c nitfol/oplist.h \ + nitfol/op_math.c nitfol/op_math.h nitfol/op_save.c nitfol/op_save.h \ + nitfol/op_table.c nitfol/op_table.h nitfol/op_v6.c nitfol/op_v6.h \ + nitfol/portfunc.c nitfol/portfunc.h nitfol/quetzal.c nitfol/quetzal.h \ + nitfol/solve.c nitfol/solve.h nitfol/stack.c nitfol/stack.h \ + nitfol/struct.c nitfol/struct.h nitfol/tokenise.c nitfol/tokenise.h \ + nitfol/undo.c nitfol/undo.h nitfol/z_io.c nitfol/z_io.h nitfol/zscii.c \ + nitfol/zscii.h \ + $(NITFOL_GRAPHICS) $(NITFOL_BLORB) $(NITFOL_SOUND) +nodist_nitfol_la_SOURCES = nitfol/copying.c nitfol/dbg_help.h nitfol/startunix.c +nitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \ + -I$(srcdir)/nitfol -DSMART_TOKENISER -DUSE_INLINE +nitfol_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) + +info_TEXINFOS = nitfol/nitfol.texi +nitfol_TEXINFOS = nitfol/dbg_help.texi nitfol/options.texi +# man_MANS = nitfol/nitfol.6 + +BUILT_SOURCES = nitfol/copying.c nitfol/dbg_help.h nitfol/startunix.c \ + nitfol/dbg_help.texi nitfol/options.texi +CLEANFILES += $(BUILT_SOURCES) nitfol/nitfol.6 +DISTCLEANFILES = nitfol/inform.c nitfol/nitfol.info +MAINTAINERCLEANFILES = texinfo.tex + +nitfol/dbg_help.h: nitfol/inform.y nitfol/y2help.pl + $(AM_V_GEN)cd nitfol && \ + $(PERL) $(abs_srcdir)/nitfol/y2help.pl $(abs_srcdir)/nitfol/inform.y + +nitfol/dbg_help.texi: nitfol/inform.y nitfol/y2help.pl + $(AM_V_GEN)cd nitfol && \ + $(PERL) $(abs_srcdir)/nitfol/y2help.pl $(abs_srcdir)/nitfol/inform.y + +nitfol/copying.c: nitfol/COPYING nitfol/copying.awk + $(AM_V_GEN)$(AWK) -f $(srcdir)/nitfol/copying.awk <$(srcdir)/nitfol/COPYING >$@ + +# nitfol/nitfol.6: nitfol/nitfol.opt nitfol/opt2glkc.pl +# $(AM_V_GEN)cd nitfol && \ +# $(PERL) $(abs_srcdir)/nitfol/opt2glkc.pl -man $(abs_srcdir)/nitfol/nitfol.opt + +nitfol/options.texi: nitfol/nitfol.opt nitfol/opt2glkc.pl + $(AM_V_GEN)cd nitfol && \ + $(PERL) $(abs_srcdir)/nitfol/opt2glkc.pl -info $(abs_srcdir)/nitfol/nitfol.opt + +nitfol/startunix.c: nitfol/nitfol.opt nitfol/opt2glkc.pl + $(AM_V_GEN)cd nitfol && \ + $(PERL) $(abs_srcdir)/nitfol/opt2glkc.pl -unix $(abs_srcdir)/nitfol/nitfol.opt + +EXTRA_DIST = nitfol/nitfol.opt nitfol/crashme.inf nitfol/test.inf + +# Documentation + +pkgdocdir = $(datadir)/doc/$(PACKAGE) +nobase_dist_pkgdoc_DATA = bocfel/BUILDING bocfel/COPYING.GPLv2 \ + bocfel/COPYING.GPLv3 bocfel/README \ + frotz/AUTHORS frotz/COPYING frotz/README frotz/TODO \ + git/README.txt \ + glulxe/README \ + nitfol/ChangeLog nitfol/COPYING nitfol/INSTALL nitfol/README -include $(top_srcdir)/git.mk diff --git a/interpreters/bocfel.patch b/interpreters/bocfel.patch new file mode 100644 index 0000000..bf7288c --- /dev/null +++ b/interpreters/bocfel.patch @@ -0,0 +1,44 @@ +diff -ur /Users/fliep/Documents/Coding/garglk/terps/bocfel/glkstart.c ./glkstart.c +--- orig/glkstart.c 2012-09-16 01:26:30.000000000 +0200 ++++ new/glkstart.c 2012-09-23 17:53:56.000000000 +0200 +@@ -17,6 +17,7 @@ + */ + + #include ++#include + + /* Even on Win32, Gargoyle provides a glkunix startup. */ + #if defined(ZTERP_UNIX) || defined(GARGLK) +diff -ur /Users/fliep/Documents/Coding/garglk/terps/bocfel/screen.c ./screen.c +--- orig/screen.c 2012-09-16 01:26:30.000000000 +0200 ++++ new/screen.c 2012-09-23 17:53:56.000000000 +0200 +@@ -23,6 +23,7 @@ + + #ifdef ZTERP_GLK + #include ++#include + #endif + + #include "screen.h" +diff -ur /Users/fliep/Documents/Coding/garglk/terps/bocfel/util.c ./util.c +--- orig/util.c 2012-09-16 01:26:30.000000000 +0200 ++++ new/util.c 2012-09-23 17:53:56.000000000 +0200 +@@ -28,6 +28,7 @@ + + #ifdef ZTERP_GLK + #include ++#include + #endif + + #ifndef ZTERP_NO_SAFETY_CHECKS +diff -ur /Users/fliep/Documents/Coding/garglk/terps/bocfel/zterp.c ./zterp.c +--- orig/zterp.c 2012-09-16 01:26:30.000000000 +0200 ++++ new/zterp.c 2012-09-23 17:53:56.000000000 +0200 +@@ -39,6 +39,7 @@ + + #ifdef ZTERP_GLK + #include ++#include + #ifdef GARGLK + #include + #include diff --git a/interpreters/bocfel/Makefile.am b/interpreters/bocfel/Makefile.am deleted file mode 100644 index ecb779e..0000000 --- a/interpreters/bocfel/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -pkglib_LTLIBRARIES = bocfel.la -bocfel_la_SOURCES = blorb.c blorb.h branch.c branch.h dict.c dict.h glkstart.c \ - iff.c iff.h io.c io.h math.c math.h memory.c memory.h objects.c objects.h \ - osdep.c osdep.h process.c process.h random.c random.h screen.c screen.h \ - stack.c stack.h table.c table.h unicode.c unicode.h util.c util.h zoom.c \ - zoom.h zterp.c zterp.h -bocfel_la_CPPFLAGS = -DZTERP_GLK -DZTERP_UNIX \ - -I$(top_srcdir) -I$(top_srcdir)/libchimara -bocfel_la_CFLAGS = -std=c99 $(AM_CFLAGS) -bocfel_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) - -bocfeldocdir = $(datadir)/doc/$(PACKAGE)/bocfel -dist_bocfeldoc_DATA = BUILDING COPYING.GPLv2 COPYING.GPLv3 README - --include $(top_srcdir)/git.mk diff --git a/interpreters/frotz.patch b/interpreters/frotz.patch index a40dcec..1aa235a 100644 --- a/interpreters/frotz.patch +++ b/interpreters/frotz.patch @@ -1,33 +1,11 @@ ---- frotz/glkscreen.c 2009-11-14 17:44:15.617976131 +0100 -+++ frotz/glkscreen.c.new 2009-11-14 17:44:10.367194781 +0100 -@@ -305,13 +305,6 @@ - return; - } +diff -ur /Users/fliep/Documents/Coding/garglk/terps/frotz/glkfrotz.h ./glkfrotz.h +--- orig/glkfrotz.h 2012-09-16 01:26:32.000000000 +0200 ++++ new/glkfrotz.h 2011-05-01 16:18:48.000000000 +0200 +@@ -35,6 +35,7 @@ + #include -- if (gos_upper && gos_curwin == gos_upper) { -- if (cury > mach_status_ht) { -- mach_status_ht = cury; -- reset_status_ht(); -- } -- } -- - /* check fixed flag in header, game can change it at whim */ - if (gos_curwin == gos_lower) - { -@@ -583,8 +576,15 @@ - { - cury = zargs[0]; - curx = zargs[1]; -- if (gos_upper) -+ -+ if (gos_upper) { -+ if (cury > mach_status_ht) { -+ mach_status_ht = cury; -+ reset_status_ht(); -+ } -+ - glk_window_move_cursor(gos_upper, curx - 1, cury - 1); -+ } - } + #include "glk.h" ++#include - /* + extern int curr_status_ht; + extern int mach_status_ht; diff --git a/interpreters/frotz/Makefile.am b/interpreters/frotz/Makefile.am deleted file mode 100644 index fa0f0b1..0000000 --- a/interpreters/frotz/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -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 -frotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -frotz_la_CFLAGS = -Wno-pointer-sign $(AM_CFLAGS) -frotz_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) - -frotzdocdir = $(datadir)/doc/$(PACKAGE)/frotz -dist_frotzdoc_DATA = AUTHORS COPYING README TODO - --include $(top_srcdir)/git.mk diff --git a/interpreters/git.patch b/interpreters/git.patch deleted file mode 100644 index eb87fc5..0000000 --- a/interpreters/git.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff -P'aurx.*' git-1.2.4/gestalt.c git-chimara/gestalt.c ---- git-1.2.4/gestalt.c 2009-04-03 00:54:50.000000000 +0200 -+++ git-chimara/gestalt.c 2009-10-07 23:43:28.000000000 +0200 -@@ -5,7 +5,7 @@ - switch (sel) - { - case GESTALT_SPEC_VERSION: -- return 0x00030100; -+ return 0x00030101; - - case GESTALT_TERP_VERSION: - return GIT_VERSION_NUM; -Only in git-1.2.4: git_mac.c -diff -P'aurx.*' git-1.2.4/git_unix.c git-chimara/git_unix.c ---- git-1.2.4/git_unix.c 2009-04-03 00:54:50.000000000 +0200 -+++ git-chimara/git_unix.c 2009-10-07 23:59:58.000000000 +0200 -@@ -25,23 +25,47 @@ - #define CACHE_SIZE (256 * 1024L) - #define UNDO_SIZE (512 * 1024L) - -+int gHasInited = 0; -+ -+#ifdef CHIMARA_EXTENSIONS -+ -+void fatalError (const char * s) -+{ -+ winid_t win; -+ if (!gHasInited) -+ { -+ win = glk_window_open(0, 0, 0, wintype_TextBuffer, 0); -+ glk_set_window(win); -+ } -+ /* pray that this goes somewhere reasonable... */ -+ glk_put_string("\n*** fatal error: "); -+ glk_put_string((char*)s); -+ glk_put_string(" ***\n"); -+ glk_exit(); -+} -+ -+#else -+ - void fatalError (const char * s) - { - fprintf (stderr, "*** fatal error: %s ***\n", s); - exit (1); - } - -+#endif /* CHIMARA_EXTENSIONS */ -+ - #ifdef USE_MMAP - // Fast loader that uses some fancy Unix features. - - const char * gFilename = 0; -+char * gStartupError = 0; - - int glkunix_startup_code(glkunix_startup_t *data) - { - if (data->argc <= 1) - { -- printf ("usage: git gamefile.ulx\n"); -- return 0; -+ gStartupError = "No file given"; -+ return 1; - } - gFilename = data->argv[1]; - return 1; -@@ -52,7 +76,10 @@ - int file; - struct stat info; - const char * ptr; -- -+ -+ if (gStartupError) -+ fatalError(gStartupError); -+ - file = open (gFilename, O_RDONLY); - if (file < 0) - goto error; -@@ -61,35 +88,35 @@ - goto error; - - if (info.st_size < 256) -- { -- fprintf (stderr, "This is too small to be a glulx file.\n"); -- exit (1); -- } -+ fatalError("This is too small to be a glulx file."); - - ptr = mmap (NULL, info.st_size, PROT_READ, MAP_PRIVATE, file, 0); - if (ptr == MAP_FAILED) - goto error; -+ -+ gHasInited = 1; - - git (ptr, info.st_size, CACHE_SIZE, UNDO_SIZE); - munmap ((void*) ptr, info.st_size); - return; - - error: -- perror ("git"); -- exit (errno); -+ sprintf(errmsg, "git: %s", strerror(errno)); -+ fatalError(errmsg); - } - - #else - // Generic loader that should work anywhere. - - strid_t gStream = 0; -+char * gStartupError = 0; - - int glkunix_startup_code(glkunix_startup_t *data) - { - if (data->argc <= 1) - { -- printf ("usage: git gamefile.ulx\n"); -- return 0; -+ gStartupError = "No file given"; -+ return 1; - } - gStream = glkunix_stream_open_pathname ((char*) data->argv[1], 0, 0); - return 1; -@@ -97,9 +124,14 @@ - - void glk_main () - { -+ if (gStartupError) -+ fatalError(gStartupError); -+ - if (gStream == NULL) - fatalError ("could not open game file"); - -+ gHasInited = 1; -+ - gitWithStream (gStream, CACHE_SIZE, UNDO_SIZE); - } - -Only in git-1.2.4: git_windows.c -Only in git-1.2.4: Makefile -diff -P'aurx.*' git-1.2.4/Makefile.am git-chimara/Makefile.am ---- git-1.2.4/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ git-chimara/Makefile.am 2009-10-07 23:59:34.000000000 +0200 -@@ -0,0 +1,48 @@ -+PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk" -+ -+# Automatically generate version.h -+MAJOR = 1 -+MINOR = 2 -+PATCH = 4 -+version.h: Makefile -+ echo "// Automatically generated file -- do not edit!" > version.h -+ echo "#define GIT_MAJOR" $(MAJOR) >> version.h -+ echo "#define GIT_MINOR" $(MINOR) >> version.h -+ echo "#define GIT_PATCH" $(PATCH) >> version.h -+ -+pkglib_LTLIBRARIES = git.la -+BUILT_SOURCES = version.h -+git_la_SOURCES = version.h git.h config.h compiler.h memory.h opcodes.h \ -+ labels.inc compiler.c gestalt.c git.c git_unix.c glkop.c heap.c memory.c \ -+ opcodes.c operands.c peephole.c savefile.c saveundo.c search.c terp.c \ -+ accel.c -+git_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -+git_la_CFLAGS = -DCHIMARA_EXTENSIONS -DUSE_INLINE $(AM_CFLAGS) -+git_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -+ -+gitdocdir = $(datadir)/doc/$(PACKAGE)/git -+dist_gitdoc_DATA = README.txt -+ -+CLEANFILES = test/*.tmp -+ -+#TESTS = test/test.sh \ -+# test/Alabaster.gblorb test/Alabaster.walk test/Alabaster.golden -+# -+#test: git -+# sh test/test.sh -+ -+# Memory mapping (-DUSE_MMAP) doesn't seem to work... FIXME -+ -+# Best settings for GCC 2.95. This generates faster code than -+# GCC 3, so you should use this setup if possible. -+#CC = gcc -Wall -O3 -+#OPTIONS = -DUSE_DIRECT_THREADING -DUSE_MMAP -DUSE_INLINE -+# -+# Best settings for GCC 3. The optimiser in this version of GCC -+# is somewhat broken, so we can't use USE_DIRECT_THREADING. -+#CC = gcc -Wall -O3 -+#OPTIONS = -DUSE_MMAP -DUSE_INLINE -+# -+# Mac OS X (PowerPC) settings. -+#CC = gcc2 -Wall -O3 -no-cpp-precomp -+#OPTIONS = -DUSE_DIRECT_THREADING -DUSE_BIG_ENDIAN_UNALIGNED -DUSE_MMAP -DUSE_INLINE -Only in git-1.2.4: Makefile.win -Only in git-1.2.4: win diff --git a/interpreters/git/Makefile.am b/interpreters/git/Makefile.am deleted file mode 100644 index f025600..0000000 --- a/interpreters/git/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Automatically generate version.h -MAJOR = 1 -MINOR = 2 -PATCH = 9 -version.h: Makefile.am - $(AM_V_GEN)echo "// Automatically generated file -- do not edit!" > version.h - $(AM_V_at)echo "#define GIT_MAJOR" $(MAJOR) >> version.h - $(AM_V_at)echo "#define GIT_MINOR" $(MINOR) >> version.h - $(AM_V_at)echo "#define GIT_PATCH" $(PATCH) >> version.h - -pkglib_LTLIBRARIES = git.la -BUILT_SOURCES = version.h -git_la_SOURCES = version.h git.h config.h compiler.h memory.h opcodes.h \ - labels.inc compiler.c gestalt.c git.c git_unix.c glkop.c heap.c memory.c \ - opcodes.c operands.c peephole.c savefile.c saveundo.c search.c terp.c \ - accel.c -git_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -git_la_CFLAGS = -DCHIMARA_EXTENSIONS -DUSE_INLINE $(AM_CFLAGS) -git_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) - -gitdocdir = $(datadir)/doc/$(PACKAGE)/git -dist_gitdoc_DATA = README.txt - -CLEANFILES = version.h test/*.tmp - -#TESTS = test/test.sh \ -# test/Alabaster.gblorb test/Alabaster.walk test/Alabaster.golden -# -#test: git -# sh test/test.sh - -# Memory mapping (-DUSE_MMAP) doesn't seem to work... FIXME - -# Best settings for GCC 2.95. This generates faster code than -# GCC 3, so you should use this setup if possible. -#CC = gcc -Wall -O3 -#OPTIONS = -DUSE_DIRECT_THREADING -DUSE_MMAP -DUSE_INLINE -# -# Best settings for GCC 3. The optimiser in this version of GCC -# is somewhat broken, so we can't use USE_DIRECT_THREADING. -#CC = gcc -Wall -O3 -#OPTIONS = -DUSE_MMAP -DUSE_INLINE -# -# Mac OS X (PowerPC) settings. -#CC = gcc2 -Wall -O3 -no-cpp-precomp -#OPTIONS = -DUSE_DIRECT_THREADING -DUSE_BIG_ENDIAN_UNALIGNED -DUSE_MMAP -DUSE_INLINE - --include $(top_srcdir)/git.mk diff --git a/interpreters/glulxe/Makefile.am b/interpreters/glulxe/Makefile.am deleted file mode 100644 index f3da057..0000000 --- a/interpreters/glulxe/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -pkglib_LTLIBRARIES = glulxe.la -glulxe_la_SOURCES = accel.c exec.c files.c funcs.c gestalt.c gestalt.h glkop.c \ - glulxe.h heap.c main.c opcodes.h operand.c osdepend.c profile.c search.c \ - serial.c string.c unixstrt.c vm.c float.c -glulxe_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -DOS_UNIX -glulxe_la_CFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-unused \ - $(AM_CFLAGS) -glulxe_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) - -#noinst_PROGRAMS = glulxdump -#glulxdump_SOURCES = glulxdump.c -#glulxdump_CPPFLAGS = -I$(top_srcdir)/src/libchimara -#glulxdump_LDADD = ../../libchimara/libchimara.la - -dist_pkglibexec_SCRIPTS = profile-analyze.py - -glulxedocdir = $(datadir)/doc/$(PACKAGE)/glulxe -dist_glulxedoc_DATA = README - --include $(top_srcdir)/git.mk diff --git a/interpreters/nitfol.patch b/interpreters/nitfol.patch deleted file mode 100644 index e249d17..0000000 --- a/interpreters/nitfol.patch +++ /dev/null @@ -1,389 +0,0 @@ -diff -P'aurx.*' nitfol-0.5/automap.c nitfol-chimara/automap.c ---- nitfol-0.5/automap.c 1999-10-20 02:09:46.000000000 +0200 -+++ nitfol-chimara/automap.c 2009-09-10 21:39:06.000000000 +0200 -@@ -1066,6 +1066,8 @@ - - #else - -+char *roomsymbol = NULL; -+ - BOOL automap_unexplore(void) - { - return FALSE; -diff -P'aurx.*' nitfol-0.5/automap.h nitfol-chimara/automap.h ---- nitfol-0.5/automap.h 1999-10-25 02:55:13.000000000 +0200 -+++ nitfol-chimara/automap.h 2009-09-10 21:39:11.000000000 +0200 -@@ -26,6 +26,7 @@ - BOOL automap_unexplore (void); - - #else -+extern char * roomsymbol; - BOOL automap_unexplore (void); - - #endif -Only in nitfol-0.5: copying.c -Only in nitfol-0.5: dbg_help.h -Only in nitfol-0.5: dbg_help.texi -Only in nitfol-0.5: gi_blorb.h -Only in nitfol-0.5: glk.h -Only in nitfol-0.5: glkstart.h -Only in nitfol-0.5: inform.c -Only in nitfol-0.5: inform.hhh -diff -P'aurx.*' nitfol-0.5/inform.y nitfol-chimara/inform.y ---- nitfol-0.5/inform.y 1999-10-25 02:37:17.000000000 +0200 -+++ nitfol-chimara/inform.y 2009-09-10 21:38:56.000000000 +0200 -@@ -304,7 +304,7 @@ - /* :: Show the current source language. */ - | LANGUAGE { infix_print_string("The current source language is \"inform\".\n"); } - /* :: Get information on the current source file. */ -- | INFOSOURCE { infix_print_string("Current source file is "); infix_print_string(cur_file->filename); infix_print_string("\nContains "); infix_print_number(cur_file->num_lines); infix_print_string(" lines.\nSource language is inform.\n"); } -+ | INFOSOURCE { infix_print_string("Current source file is "); infix_print_string(cur_file?cur_file->filename:"unknown"); infix_print_string("\nContains "); infix_print_number(cur_file?cur_file->num_lines:0); infix_print_string(" lines.\nSource language is inform.\n"); } - /* :: List source files. */ - | INFOSOURCES { infix_print_string("Source files for which symbols have been read in:\n\n"); infix_list_files(); infix_print_char('\n'); } - /* :: Show licensing information. */ -@@ -346,9 +346,9 @@ - */ - ; - --linespec: NUM { if($1.t == Z_ROUTINE) $$ = infix_get_routine_PC($1.v); else { infix_location l; infix_decode_fileloc(&l, cur_file->filename, $1.v); $$ = l.thisPC; } } -- | '+' NUM { infix_location l; infix_decode_fileloc(&l, cur_file->filename, cur_line + $2.v); $$ = l.thisPC; } -- | '-' NUM { infix_location l; infix_decode_fileloc(&l, cur_file->filename, cur_line - $2.v); $$ = l.thisPC; } -+linespec: NUM { if($1.t == Z_ROUTINE) $$ = infix_get_routine_PC($1.v); else { infix_location l; infix_decode_fileloc(&l, cur_file?cur_file->filename:"", $1.v); $$ = l.thisPC; } } -+ | '+' NUM { infix_location l; infix_decode_fileloc(&l, cur_file?cur_file->filename:"", cur_line + $2.v); $$ = l.thisPC; } -+ | '-' NUM { infix_location l; infix_decode_fileloc(&l, cur_file?cur_file->filename:"", cur_line - $2.v); $$ = l.thisPC; } - | DFILE ':' NUM { if($3.t == Z_ROUTINE) $$ = UNPACKR($3.v); else { infix_location l; infix_decode_fileloc(&l, $1->filename, $3.v); $$ = l.thisPC; } } - | '*' NUM { $$ = $2.v; } - ; -@@ -388,6 +388,7 @@ - /* Expressions with conditions */ - condexp: - exp CONDITION { cond_list newcond; newcond.val = $1.v; newcond.condfunc = $2.condfunc; newcond.opposite = $2.opposite; LEaddm(condlist, newcond, n_rmmalloc); } orlist { if($4) ignoreeffects--; $$.v = $4; $$.t = Z_BOOLEAN; LEremovem(condlist, n_rmfreeone); } -+; - - /* Expressions without commas */ - exp: NUM -diff -P'aurx.*' nitfol-0.5/init.c nitfol-chimara/init.c ---- nitfol-0.5/init.c 1999-10-24 17:38:06.000000000 +0200 -+++ nitfol-chimara/init.c 2009-09-10 21:38:52.000000000 +0200 -@@ -250,7 +250,10 @@ - z_synonymtable = MSBdecodeZ(header + HD_ABBREV); - - switch(zversion) { -- case 1: case 2: case 3: -+ case 1: case 2: -+ game_size = filesize; -+ break; -+ case 3: - game_size = ((offset) MSBdecodeZ(header + HD_LENGTH)) * 2; - break; - case 4: case 5: -@@ -329,13 +332,15 @@ - n_show_fatal(E_SYSTEM, "unexpected number of bytes read", bytes_read); - - z_checksum = 0; -- for(i = 0x40; i < game_size; i++) -- z_checksum += HIBYTE(i); -- z_checksum = ARITHMASK(z_checksum); -- -- if(z_checksum != LOWORD(HD_CHECKSUM)) { -- n_show_error(E_CORRUPT, "Checksum does not match", z_checksum); -- check_ascii_mode(); -+ if (zversion >= 3) { -+ for(i = 0x40; i < game_size; i++) -+ z_checksum += HIBYTE(i); -+ z_checksum = ARITHMASK(z_checksum); -+ -+ if(LOWORD(HD_CHECKSUM) != 0 && z_checksum != LOWORD(HD_CHECKSUM)) { -+ n_show_error(E_CORRUPT, "Checksum does not match", z_checksum); -+ check_ascii_mode(); -+ } - } - - -diff -P'aurx.*' nitfol-0.5/io.c nitfol-chimara/io.c ---- nitfol-0.5/io.c 1999-10-22 04:53:34.000000000 +0200 -+++ nitfol-chimara/io.c 2009-09-10 21:41:59.000000000 +0200 -@@ -103,9 +103,9 @@ - stylehint_Proportional, 0); - glk_stylehint_set(wintype_TextBuffer, style_BlockQuote, - stylehint_Justification, stylehint_just_Centered); --#ifdef stylehint_Reverse -+#ifdef stylehint_ReverseColor - glk_stylehint_set(wintype_TextBuffer, style_BlockQuote, -- stylehint_Reverse, 1); -+ stylehint_ReverseColor, 1); - #endif - - /* User1 will be used for bold italics */ -@@ -410,7 +410,7 @@ - - upper_win->win = glk_window_open(game_windows[0].win, - winmethod_Above | winmethod_Fixed, -- upper_height, -+ 1, /* XXX huh? upper_height, */ - wintype_TextGrid, 1); - - if(upper_win->win == 0) { -diff -P'aurx.*' nitfol-0.5/main.c nitfol-chimara/main.c ---- nitfol-0.5/main.c 1999-10-18 01:14:39.000000000 +0200 -+++ nitfol-chimara/main.c 2009-09-10 21:42:28.000000000 +0200 -@@ -90,17 +90,33 @@ - if(!current_zfile) { - winid_t tempwin; - tempwin = glk_window_open(0, 0, 100, wintype_TextBuffer, 0); -- while(!current_zfile) { -- strid_t z = n_file_prompt(fileusage_Data | fileusage_BinaryMode, -- filemode_Read); -- if(!z) { -- w_glk_put_string_stream(glk_window_get_stream(tempwin), -- "File not found."); -- continue; -- } -- set_zfile(z); -- } -- glk_window_close(tempwin, NULL); -+ glk_set_window(tempwin); -+ glk_set_style(style_Preformatted); -+ glk_put_string( -+"Usage: nitfol [OPTIONS] gamefile\n" -+" -i, -ignore Ignore Z-machine strictness errors\n" -+" -f, -fullname For running under Emacs or DDD\n" -+" -x, -command Read commands from this file\n" -+" -P, -pirate Aye, matey\n" -+" -spell Perform spelling correction\n" -+" -expand Expand one letter abbreviations\n" -+" -s, -symbols Specify symbol file for game\n" -+" -t, -tandy Censors some Infocom games\n" -+" -T, -transcript Write transcript to this file\n" -+" -d, -debug Enter debugger immediatly\n" -+" -prompt Specify debugging prompt\n" -+" -autoundo Ensure '@save_undo' is called every turn\n" -+" -S, -stacklimit Exit when the stack is this deep\n" -+" -a, -alias Specify an alias\n" -+" -ralias Specify an recursive alias\n" -+" -unalias Remove an alias\n" -+" -r, -random Set random seed\n" -+" -mapsym Specify mapping glyphs\n" -+" -mapsize Specify map size\n" -+" -maploc Specify map location\n" -+" -terpnum Specify interpreter number\n" -+" -terpver Specify interpreter version\n"); -+ glk_exit(); - } - z_init(current_zfile); - if(savefile) { -Only in nitfol-0.5: Make.dummy -Only in nitfol-0.5: Makefile -diff -P'aurx.*' nitfol-0.5/Makefile.am nitfol-chimara/Makefile.am ---- nitfol-0.5/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ nitfol-chimara/Makefile.am 2009-09-10 00:04:11.000000000 +0200 -@@ -0,0 +1,58 @@ -+PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk" -+ -+GRAPHICS = no_graph.c no_graph.h -+# GRAPHICS = graphics.c graphics.h -+BLORB = blorb.c -+# BLORB = no_blorb.c -+SOUND = no_snd.c no_snd.h -+# SOUND = sound.c sound.h -+ -+dist_noinst_SCRIPTS = copying.awk opt2glkc.pl y2help.pl -+ -+pkglib_LTLIBRARIES = nitfol.la -+nitfol_la_SOURCES = automap.c automap.h binary.h copying.h debug.c debug.h \ -+ decode.c decode.h errmesg.c errmesg.h globals.c globals.h hash.c hash.h \ -+ iff.c iff.h infix.c infix.h inform.y inform.h init.c init.h io.c \ -+ linkevil.h main.c main.h nio.h nitfol.h no_blorb.h objects.c objects.h \ -+ op_call.c op_call.h op_jmp.c op_jmp.h oplist.c oplist.h op_math.c \ -+ op_math.h op_save.c op_save.h op_table.c op_table.h op_v6.c op_v6.h \ -+ portfunc.c portfunc.h quetzal.c quetzal.h solve.c solve.h stack.c stack.h \ -+ struct.c struct.h tokenise.c tokenise.h undo.c undo.h z_io.c z_io.h \ -+ zscii.c zscii.h \ -+ $(GRAPHICS) \ -+ $(BLORB) \ -+ $(SOUND) -+nodist_nitfol_la_SOURCES = copying.c dbg_help.h startunix.c -+nitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \ -+ -DSMART_TOKENISER -DUSE_INLINE -+nitfol_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -+ -+info_TEXINFOS = nitfol.texi -+nitfol_TEXINFOS = dbg_help.texi options.texi -+# man_MANS = nitfol.6 -+ -+BUILT_SOURCES = copying.c dbg_help.h startunix.c -+CLEANFILES = $(BUILT_SOURCES) dbg_help.texi nitfol.6 options.texi -+ -+dbg_help.h: inform.y y2help.pl -+ $(PERL) $(srcdir)/y2help.pl $(srcdir)/inform.y -+ -+dbg_help.texi: inform.y y2help.pl -+ $(PERL) $(srcdir)/y2help.pl $(srcdir)/inform.y -+ -+copying.c: COPYING copying.awk -+ $(AWK) --file $(srcdir)/copying.awk <$(srcdir)/COPYING >copying.c -+ -+# nitfol.6: nitfol.opt opt2glkc.pl -+# $(PERL) $(srcdir)/opt2glkc.pl -man $(srcdir)/nitfol.opt -+ -+options.texi: nitfol.opt opt2glkc.pl -+ $(PERL) $(srcdir)/opt2glkc.pl -info $(srcdir)/nitfol.opt -+ -+startunix.c: nitfol.opt opt2glkc.pl -+ $(PERL) $(srcdir)/opt2glkc.pl -unix $(srcdir)/nitfol.opt -+ -+EXTRA_DIST = nitfol.opt crashme.inf test.inf -+ -+nitfoldocdir = $(datadir)/doc/$(PACKAGE)/nitfol -+dist_nitfoldoc_DATA = ChangeLog COPYING INSTALL README -Only in nitfol-0.5: nitfol -Only in nitfol-0.5: nitfol.6 -diff -P'aurx.*' nitfol-0.5/nitfol.h nitfol-chimara/nitfol.h ---- nitfol-0.5/nitfol.h 1999-10-24 16:56:06.000000000 +0200 -+++ nitfol-chimara/nitfol.h 2009-09-10 21:56:44.000000000 +0200 -@@ -30,11 +30,12 @@ - #define NITFOL_MINOR 5 - - /* Change these next few typedefs depending on your compiler */ --typedef unsigned char zbyte; -+#include -+typedef uint8_t zbyte; - - #ifdef FAST_SHORT --typedef unsigned short zword; --typedef unsigned long offset; -+typedef uint16_t zword; -+typedef uint32_t offset; - - #ifdef TWOS16SHORT - #define FAST_TWOS16SHORT -@@ -43,11 +44,11 @@ - #else - - #ifdef FAST_SIGNED --typedef int zword; --typedef long offset; -+typedef int32_t zword; -+typedef int32_t offset; - #else --typedef unsigned int zword; /* Needs to be >= real zword */ --typedef unsigned long offset; -+typedef uint32_t zword; /* Needs to be >= real zword */ -+typedef uint32_t offset; - #endif - - #endif -Only in nitfol-0.5: nitfol.html -Only in nitfol-0.5: nitfol.info -diff -P'aurx.*' nitfol-0.5/nitfol.opt nitfol-chimara/nitfol.opt ---- nitfol-0.5/nitfol.opt 1999-10-24 16:56:06.000000000 +0200 -+++ nitfol-chimara/nitfol.opt 2009-09-10 21:56:44.000000000 +0200 -@@ -3,7 +3,7 @@ - # You can alter the 'default' part to change the game's default options. - - # Longest name Long short description type default code -- "Ignore errors" ignore i "Ignore Z-machine strictness errors" flag 1 { ignore_errors = flag; } -+ "Ignore errors" ignore i "Ignore Z-machine strictness errors" flag 1 { ignore_errors = flag; } - Normally nitfol checks for illegal and undefined Z-machine behaviour and alerts the user. If you're playing someone else's buggy game, this can be annoying and you should use this option. - - "Inferior debugger" fullname f "For running under Emacs or DDD" flag 0 { fullname = flag; } -Only in nitfol-0.5: options.texi -Only in nitfol-0.5: rg_qsort.h -Only in nitfol-0.5: startdos.c -Only in nitfol-0.5: startmac.c -Only in nitfol-0.5: startunix.c -Only in nitfol-0.5: startwin.c -diff -P'aurx.*' nitfol-0.5/z_io.c nitfol-chimara/z_io.c ---- nitfol-0.5/z_io.c 1999-10-24 19:20:50.000000000 +0200 -+++ nitfol-chimara/z_io.c 2009-04-05 19:17:51.000000000 +0200 -@@ -900,13 +900,14 @@ - - length = n_read(text + 1, maxlen, operand[1], 0, - operand[2], operand[3], &term); -- if(!read_abort) -+ if(!read_abort) { - LOBYTEwrite(text + 1 + length, 0); /* zero terminator */ - -- if(allow_saveundo) { -- if(!has_done_save_undo && auto_save_undo) -- saveundo(FALSE); -- has_done_save_undo = FALSE; -+ if(allow_saveundo) { -+ if(!has_done_save_undo && auto_save_undo) -+ saveundo(FALSE); -+ has_done_save_undo = FALSE; -+ } - } - } - -@@ -928,12 +929,12 @@ - if(!read_abort) { - LOBYTEwrite(text + 1, length); - mop_store_result(term); -- } -- -- if(allow_saveundo) { -- if(!has_done_save_undo && auto_save_undo) -- saveundo(FALSE); -- has_done_save_undo = FALSE; -+ -+ if(allow_saveundo) { -+ if(!has_done_save_undo && auto_save_undo) -+ saveundo(FALSE); -+ has_done_save_undo = FALSE; -+ } - } - } - -@@ -1094,5 +1095,38 @@ - - void op_print_unicode(void) - { -- output_char(operand[0]); -+ if(!allow_output) -+ return; -+ if(operand[0] >= 256 || (operand[0] > 127 && operand[0] < 160)) { -+ output_char('?'); -+ return; -+ } -+ if(output_stream & STREAM3) { -+ if(operand[0] >= 160) { -+ const unsigned char default_unicode_zscii_translation[] = { -+ 0x00, 0xde, 0x00, 0xdb, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0xa3, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0xdf, -+ 0xba, 0xaf, 0xc4, 0xd0, 0x9e, 0xca, 0xd4, 0xd6, -+ 0xbb, 0xb0, 0xc5, 0xa7, 0xbc, 0xb1, 0xc6, 0xa8, -+ 0xda, 0xd1, 0xbd, 0xb2, 0xc7, 0xd2, 0x9f, 0x00, -+ 0xcc, 0xbe, 0xb3, 0xc8, 0xa0, 0xb4, 0xd9, 0xa1, -+ 0xb5, 0xa9, 0xbf, 0xcd, 0x9b, 0xc9, 0xd3, 0xd5, -+ 0xb6, 0xaa, 0xc0, 0xa4, 0xb7, 0xab, 0xc1, 0xa5, -+ 0xd8, 0xce, 0xb8, 0xac, 0xc2, 0xcf, 0x9c, 0x00, -+ 0xcb, 0xb9, 0xad, 0xc3, 0x9d, 0xae, 0xd7, 0xa6 -+ }; -+ unsigned char c = default_unicode_zscii_translation[operand[0] - 160]; -+ output_char(c == 0 ? '?' : c); -+ } else if(operand[0] == 10) { -+ output_char(13); -+ } else { -+ output_char(operand[0]); -+ } -+ } else { -+ if(output_stream & STREAM1) { -+ z_put_char(current_window, operand[0]); -+ } -+ } - } -diff -P'aurx.*' nitfol-0.5/zscii.c nitfol-chimara/zscii.c ---- nitfol-0.5/zscii.c 1999-10-18 01:14:45.000000000 +0200 -+++ nitfol-chimara/zscii.c 2009-04-05 19:17:51.000000000 +0200 -@@ -41,7 +41,7 @@ - - - /* Returns character for given alphabet, letter pair */ --static char alphabetsoup(unsigned spoon, unsigned char letter) -+static unsigned char alphabetsoup(unsigned spoon, unsigned char letter) - { - const char *alphabet; - diff --git a/interpreters/nitfol/Makefile.am b/interpreters/nitfol/Makefile.am deleted file mode 100644 index 1e721b1..0000000 --- a/interpreters/nitfol/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -#GRAPHICS = no_graph.c no_graph.h -GRAPHICS = graphics.c graphics.h -BLORB = blorb.c -# BLORB = no_blorb.c -# SOUND = no_snd.c no_snd.h -SOUND = sound.c sound.h - -dist_noinst_SCRIPTS = copying.awk opt2glkc.pl y2help.pl - -pkglib_LTLIBRARIES = nitfol.la -nitfol_la_SOURCES = automap.c automap.h binary.h copying.h debug.c debug.h \ - decode.c decode.h errmesg.c errmesg.h globals.c globals.h hash.c hash.h \ - iff.c iff.h infix.c infix.h inform.y inform.h init.c init.h io.c nio.h \ - linkevil.h main.c main.h nitfol.h no_blorb.h objects.c objects.h op_call.c \ - op_call.h op_jmp.c op_jmp.h oplist.c oplist.h op_math.c op_math.h \ - op_save.c op_save.h op_table.c op_table.h op_v6.c op_v6.h portfunc.c \ - portfunc.h quetzal.c quetzal.h solve.c solve.h stack.c stack.h struct.c \ - struct.h tokenise.c tokenise.h undo.c undo.h z_io.c z_io.h zscii.c zscii.h \ - $(GRAPHICS) \ - $(BLORB) \ - $(SOUND) -nodist_nitfol_la_SOURCES = copying.c dbg_help.h startunix.c -nitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \ - -DSMART_TOKENISER -DUSE_INLINE -nitfol_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) - -info_TEXINFOS = nitfol.texi -nitfol_TEXINFOS = dbg_help.texi options.texi -# man_MANS = nitfol.6 - -BUILT_SOURCES = copying.c dbg_help.h startunix.c dbg_help.texi options.texi -CLEANFILES = $(BUILT_SOURCES) nitfol.6 -DISTCLEANFILES = inform.c nitfol.info -MAINTAINERCLEANFILES = texinfo.tex - -dbg_help.h: inform.y y2help.pl - $(AM_V_GEN)$(PERL) $(srcdir)/y2help.pl $(srcdir)/inform.y - -dbg_help.texi: inform.y y2help.pl - $(AM_V_GEN)$(PERL) $(srcdir)/y2help.pl $(srcdir)/inform.y - -copying.c: COPYING copying.awk - $(AM_V_GEN)$(AWK) -f $(srcdir)/copying.awk <$(srcdir)/COPYING >copying.c - -# nitfol.6: nitfol.opt opt2glkc.pl -# $(AM_V_GEN)$(PERL) $(srcdir)/opt2glkc.pl -man $(srcdir)/nitfol.opt - -options.texi: nitfol.opt opt2glkc.pl - $(AM_V_GEN)$(PERL) $(srcdir)/opt2glkc.pl -info $(srcdir)/nitfol.opt - -startunix.c: nitfol.opt opt2glkc.pl - $(AM_V_GEN)$(PERL) $(srcdir)/opt2glkc.pl -unix $(srcdir)/nitfol.opt - -EXTRA_DIST = nitfol.opt crashme.inf test.inf - -nitfoldocdir = $(datadir)/doc/$(PACKAGE)/nitfol -dist_nitfoldoc_DATA = ChangeLog COPYING INSTALL README - --include $(top_srcdir)/git.mk -- 2.30.2