-libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^(glk_|chimara_glk_|glkunix_|giblorb_)"
-libchimara_includedir = $(includedir)/chimara/chimara
-libchimara_include_HEADERS = chimara-glk.h
+libchimara_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+ -no-undefined \
+ -export-symbols-regex "^(glk|chimara|glkunix|giblorb|gidispatch|garglk)_"
+libchimara_includedir = $(includedir)/chimara/libchimara
+libchimara_include_HEADERS = \
+ chimara-glk.h \
+ chimara-if.h \
+ glk.h \
+ glkstart.h \
+ gi_blorb.h \
+ garglk.h
+
+BUILT_SOURCES = chimara-marshallers.c chimara-marshallers.h
+chimara-marshallers.c: chimara-marshallers.txt
+ glib-genmarshal --body --prefix=chimara_marshal $< > $@
+
+chimara-marshallers.h: chimara-marshallers.txt
+ glib-genmarshal --header --prefix=chimara_marshal $< > $@