From 777a35ee0af6ffbc990e20ff64c6757d67f837c2 Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sun, 24 May 2009 22:06:29 +0000
Subject: [PATCH] Fixing installed headers and directories

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@90 ddfedd41-794f-dd11-ae45-00112f111e67
---
 chimara-plugin.pc.in   |  3 +--
 libchimara/Makefile.am | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/chimara-plugin.pc.in b/chimara-plugin.pc.in
index 8fe243d..0190516 100644
--- 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 fa18747..baf75dc 100644
--- 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
-- 
2.30.2