X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=interpreters%2FMakefile.am;h=53a2cf44c60d47e2bceb6a49a7f9aaeaad4a1515;hb=f8a1c493a8e97cc3468b5c5940183350a3758830;hp=c3754592410049068c2720daaa067d71fe6e2970;hpb=4003ab9746b147ef4ade120d03df62d06d5a3850;p=projects%2Fchimara%2Fchimara.git

diff --git a/interpreters/Makefile.am b/interpreters/Makefile.am
index c375459..53a2cf4 100644
--- a/interpreters/Makefile.am
+++ b/interpreters/Makefile.am
@@ -1,6 +1,7 @@
 # All plugins
 
-pkglib_LTLIBRARIES = libbocfel.la libfrotz.la libgit.la libglulxe.la \
+plugindir = $(pkglibdir)/plugins
+plugin_LTLIBRARIES = libbocfel.la libfrotz.la libgit.la libglulxe.la \
 	libnitfol.la
 CLEANFILES =
 
@@ -14,11 +15,12 @@ libbocfel_la_SOURCES = bocfel/blorb.c bocfel/blorb.h bocfel/branch.c \
 	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/zoom.c bocfel/zoom.h bocfel/zterp.c bocfel/zterp.h \
+	chimara-bocfel-plugin.c chimara-bocfel-plugin.h
 libbocfel_la_CPPFLAGS = -DZTERP_GLK -DZTERP_UNIX \
 	-I$(top_srcdir) -I$(top_srcdir)/libchimara
-libbocfel_la_CFLAGS = -std=c99 $(AM_CFLAGS)
-libbocfel_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS)
+libbocfel_la_CFLAGS = -std=c99 $(PLUGIN_CFLAGS) $(AM_CFLAGS)
+libbocfel_la_LDFLAGS = -module $(PLUGIN_LIBS) $(PLUGIN_LIBTOOL_FLAGS)
 
 # Frotz
 
@@ -27,10 +29,10 @@ libfrotz_la_SOURCES = frotz/buffer.c frotz/err.c frotz/fastmem.c frotz/files.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/glkio.h chimara-frotz-plugin.c chimara-frotz-plugin.h
 libfrotz_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara
-libfrotz_la_CFLAGS = -Wno-pointer-sign $(AM_CFLAGS)
-libfrotz_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS)
+libfrotz_la_CFLAGS = -Wno-pointer-sign $(PLUGIN_CFLAGS) $(AM_CFLAGS)
+libfrotz_la_LDFLAGS = -module $(PLUGIN_LIBS) $(PLUGIN_LIBTOOL_FLAGS)
 
 # Git
 
@@ -38,10 +40,11 @@ libgit_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/terp.c git/accel.c chimara-git-plugin.c chimara-git-plugin.h
 libgit_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara
-libgit_la_CFLAGS = -DCHIMARA_EXTENSIONS -DUSE_INLINE $(AM_CFLAGS)
-libgit_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS)
+libgit_la_CFLAGS = -DCHIMARA_EXTENSIONS -DUSE_INLINE \
+	$(PLUGIN_CFLAGS) $(AM_CFLAGS)
+libgit_la_LDFLAGS = -module $(PLUGIN_LIBS) $(PLUGIN_LIBTOOL_FLAGS)
 # Memory mapping (-DUSE_MMAP) doesn't seem to work... FIXME
 
 CLEANFILES += git/test/*.tmp
@@ -53,11 +56,11 @@ libglulxe_la_SOURCES = glulxe/accel.c glulxe/exec.c glulxe/files.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/float.c chimara-glulxe-plugin.c chimara-glulxe-plugin.h
 libglulxe_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara -DOS_UNIX
 libglulxe_la_CFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes \
-	-Wno-unused $(AM_CFLAGS)
-libglulxe_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS)
+	-Wno-unused $(PLUGIN_CFLAGS) $(AM_CFLAGS)
+libglulxe_la_LDFLAGS = -module $(PLUGIN_LIBS) $(PLUGIN_LIBTOOL_FLAGS)
 
 #noinst_PROGRAMS = glulxdump
 #glulxdump_SOURCES = glulxe/glulxdump.c
@@ -94,12 +97,14 @@ libnitfol_la_SOURCES = nitfol/automap.c nitfol/automap.h nitfol/binary.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)
+	$(NITFOL_GRAPHICS) $(NITFOL_BLORB) $(NITFOL_SOUND) \
+	chimara-nitfol-plugin.c chimara-nitfol-plugin.h
 nodist_libnitfol_la_SOURCES = nitfol/copying.c nitfol/dbg_help.h \
 	nitfol/startunix.c
 libnitfol_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libchimara \
 	-I$(srcdir)/nitfol -DSMART_TOKENISER -DUSE_INLINE
-libnitfol_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS)
+libnitfol_la_CFLAGS = $(PLUGIN_CFLAGS) $(AM_CFLAGS)
+libnitfol_la_LDFLAGS = -module $(PLUGIN_LIBS) $(PLUGIN_LIBTOOL_FLAGS)
 
 info_TEXINFOS = nitfol/nitfol.texi
 nitfol_TEXINFOS = nitfol/dbg_help.texi nitfol/options.texi
@@ -136,6 +141,11 @@ nitfol/startunix.c: nitfol/nitfol.opt nitfol/opt2glkc.pl
 
 EXTRA_DIST = nitfol/nitfol.opt nitfol/crashme.inf nitfol/test.inf
 
+# Plugin files
+
+dist_plugin_DATA = bocfel.plugin frotz.plugin git.plugin glulxe.plugin \
+	nitfol.plugin
+
 # Documentation
 
 pkgdocdir = $(datadir)/doc/$(PACKAGE)