X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2FMakefile.am;h=3f98d0898082f8a1b2ae40bc2ffbd763e221f27c;hb=4ab49e6ed54603ca26040c43cf4628cd0186632f;hp=ff634e4639c4b006e3429372cac0b3011c1858d3;hpb=40cf50b43f824311d7f14893ed1193bb5642741a;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index ff634e4..3f98d08 100644
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -5,9 +5,9 @@ AM_CFLAGS = -Wall
 lib_LTLIBRARIES = libchimara.la
 
 if TARGET_ILIAD
-	plugindir = "../interpreters"
+pluginpath = "../interpreters"
 else
-	plugindir = $(pkglibdir)
+pluginpath = $(pkglibdir)
 endif
 
 libchimara_la_SOURCES = \
@@ -17,6 +17,7 @@ libchimara_la_SOURCES = \
 	chimara-glk.c chimara-glk.h chimara-glk-private.h \
 	chimara-if.c chimara-if.h \
 	chimara-marshallers.c chimara-marshallers.h \
+	datetime.c \
 	dispatch.c \
 	event.c event.h \
 	fileref.c fileref.h \
@@ -32,10 +33,10 @@ libchimara_la_SOURCES = \
 	init.c init.h \
 	input.c input.h \
 	magic.c magic.h \
-	mouse.c \
+	mouse.c mouse.h \
 	pager.c pager.h \
 	resource.c resource.h \
-	schannel.c \
+	schannel.c schannel.h \
 	stream.c stream.h \
 	strio.c strio.h \
 	style.c style.h \
@@ -44,14 +45,14 @@ libchimara_la_SOURCES = \
 libchimara_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Chimara\" \
 	-DLOCALEDIR=\""$(datadir)/locale"\" \
-	-DPLUGINDIR=\""$(plugindir)"\" \
+	-DPLUGINDIR=\""$(pluginpath)"\" \
 	-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
 	-I$(top_srcdir)
 libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
 libchimara_la_LIBADD = @CHIMARA_LIBS@
 libchimara_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
 	-no-undefined \
-	-export-symbols-regex "^(glk|chimara|glkunix|giblorb|gidispatch)_"
+	-export-symbols-regex "^(glk|chimara|glkunix|giblorb|gidispatch|garglk)_"
 libchimara_includedir = $(includedir)/chimara/libchimara
 libchimara_include_HEADERS = \
 	chimara-glk.h \
@@ -59,13 +60,16 @@ libchimara_include_HEADERS = \
 	glk.h \
 	glkstart.h \
 	gi_blorb.h \
+	gi_dispa.h \
 	garglk.h
 
 BUILT_SOURCES = chimara-marshallers.c chimara-marshallers.h
 chimara-marshallers.c: chimara-marshallers.txt
-	glib-genmarshal --body --prefix=chimara_marshal $< > $@
+	$(AM_V_GEN)glib-genmarshal --body --prefix=_chimara_marshal $< > $@
 
 chimara-marshallers.h: chimara-marshallers.txt
-	glib-genmarshal --header --prefix=chimara_marshal $< > $@
+	$(AM_V_GEN)glib-genmarshal --header --prefix=_chimara_marshal $< > $@
 
 EXTRA_DIST = doc.c glkstart.c chimara-marshallers.txt
+
+-include $(top_srcdir)/git.mk