Fixed ordering of the application of the styles

[rodin/chimara.git] / libchimara / Makefile.am

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index 7283ed248cfbed4f3b2956e9695fc99536e1b701..f932d3ba66f0e4d8d712a208c59b3ede603c85d8 100644 (file)
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -4,6 +4,12 @@ AM_CFLAGS = -Wall
 
 lib_LTLIBRARIES = libchimara.la
 
+if TARGET_ILIAD
+pluginpath = "../interpreters"
+else
+pluginpath = $(pkglibdir)
+endif
+
 libchimara_la_SOURCES = \
        abort.c abort.h \
        case.c \
@@ -26,9 +32,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 \
@@ -37,14 +44,14 @@ libchimara_la_SOURCES = \
 libchimara_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Chimara\" \
        -DLOCALEDIR=\""$(datadir)/locale"\" \
-       -DPLUGINDIR=\""$(pkglibdir)"\" \
+       -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 \
@@ -52,13 +59,14 @@ 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 $< > $@
+       glib-genmarshal --body --prefix=_chimara_marshal $< > $@
 
 chimara-marshallers.h: chimara-marshallers.txt
-       glib-genmarshal --header --prefix=chimara_marshal $< > $@
+       glib-genmarshal --header --prefix=_chimara_marshal $< > $@
 
 EXTRA_DIST = doc.c glkstart.c chimara-marshallers.txt