Fixing installed headers and directories

diff --git a/chimara-plugin.pc.in b/chimara-plugin.pc.in
index 8fe243d11080380af57ddbbfdc65e7bfea224181..01905166223012d476bb31ba52192edab48c64f1 100644 (file)
--- a/chimara-plugin.pc.in
+++ b/chimara-plugin.pc.in
@@ -7,6 +7,5 @@ Name: Chimara
 Description: Multi-session Glk library, with interactive fiction plugins
 Version: @PACKAGE_VERSION@
 URL: http://no.public.website.yet
-Libs: -module -shared -avoid-version -export-symbols-regex "^glk_main$$"
+Libs: -module -shared -avoid-version -export-symbols-regex "^glk(_main|unix_(arguments|startup_code))$$"
 Cflags: -I${includedir}/chimara
-

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index fa187478a267cb4d17d78a77be5c06a9b3f7c632..baf75dc54da36400bb53e39e3ca2f994ea41f340 100644 (file)
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -12,25 +12,25 @@ libchimara_la_SOURCES = \
        event.c event.h \
        fileref.c fileref.h \
        gestalt.c \
+       gi_blorb.c gi_blorb.h \
        glk.c glk.h \
+       glkstart.h \
        glkunix.c glkunix.h \
+       input.c input.h \
        magic.c magic.h \
        mouse.c \
-       input.c input.h \
+       resource.c resource.h \
        stream.c stream.h \
        strio.c \
-       timer.c timer.h \
-       window.c window.h \
-       gi_blorb.c gi_blorb.h \
-       resource.c resource.h \
        style.c style.h \
-       glkstart.h
+       timer.c timer.h \
+       window.c window.h
 libchimara_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Chimara\"
 libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
 libchimara_la_LIBADD = @CHIMARA_LIBS@
 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_includedir = $(includedir)/chimara/libchimara
+libchimara_include_HEADERS = chimara-glk.h glk.h glkstart.h gi_blorb.h 
 
 EXTRA_DIST = doc.c glkstart.c