X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=40b25c92df47097da96d3045218f0146d74dc52f;hb=819616dacfef49aad64a7a6f7460ab26c0bfbf2b;hp=06cb14d9db93595c02ed7d4a70725b23ad1bde8d;hpb=6df42c314fc452367aea220f6796bb47960a9363;p=m17n%2Fm17n-lib.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 06cb14d..40b25c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,9 +37,11 @@ libm17n_core_la_SOURCES = \
 	m17n-misc.h \
 	mtext.h mtext.c \
 	symbol.h symbol.c \
-	textprop.h textprop.c
+	textprop.h textprop.c \
+	word-thai.h word-thai.c
 
-libm17n_core_la_LDFLAGS = @XML2_LD_FLAGS@ ${VINFO}
+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@
+libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
 
 libm17n_la_SOURCES = \
 	charset.h charset.c \
@@ -49,8 +51,8 @@ libm17n_la_SOURCES = \
 	language.h language.c \
 	mlocale.h locale.c \
 	m17n.h m17n.c
-libm17n_la_LIBADD = libm17n-core.la
-libm17n_la_LDFLAGS = ${VINFO}
+libm17n_la_LIBADD = ${top_srcdir}/src/libm17n-core.la -ldl
+libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
 
 GUI_SOURCES = \
 	face.h face.c \
@@ -61,7 +63,6 @@ GUI_SOURCES = \
 	internal-gui.h \
 	m17n-gui.h m17n-gui.c
 
-X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} -lX11 -lXt ${X_EXTRA_LIBS}
 OPTIONAL_LD_FLAGS = \
 	@FREETYPE_LD_FLAGS@ \
 	@FRIBIDI_LD_FLAGS@ \
@@ -69,14 +70,17 @@ OPTIONAL_LD_FLAGS = \
 	@FONTCONFIG_LD_FLAGS@
 
 libm17n_gui_la_SOURCES = ${GUI_SOURCES}
-libm17n_gui_la_LIBADD = libm17n.la
-libm17n_gui_la_LDFLAGS = ${OPTIONAL_LD_FLAGS} ${VINFO}
+libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_srcdir}/src/libm17n.la
+libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
+
+X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} -lXt -lX11 ${X_EXTRA_LIBS}
 
 libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-libm17n_X_la_LIBADD = libm17n-gui.la
-libm17n_X_la_LDFLAGS = -module ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${VINFO}
+libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_srcdir}/src/libm17n-gui.la
+libm17n_X_la_LDFLAGS = -module ${VINFO}
 
 libm17n_gd_la_SOURCES = m17n-gd.c
+libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ ${top_srcdir}/src/libm17n-gui.la
 libm17n_gd_la_LDFLAGS = -module ${VINFO}
 
 AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\""
@@ -87,15 +91,15 @@ include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h
 noinst_PROGRAMS = linkcore linkshell linkgui
 
 linkcore_SOURCES = linkcore.c
-linkcore_LDADD = libm17n-core.la
+linkcore_LDADD = ${top_srcdir}/src/libm17n-core.la
 linkcore_LDFLAGS = -static
 
 linkshell_SOURCES = linkshell.c
-linkshell_LDADD = libm17n.la
+linkshell_LDADD = ${top_srcdir}/src/libm17n.la
 linkshell_LDFLAGS = -static
 
 linkgui_SOURCES = linkgui.c
-linkgui_LDADD = libm17n-gui.la libm17n-X.la libm17n-gd.la
+linkgui_LDADD = ${top_srcdir}/src/libm17n-gui.la
 linkgui_LDFLAGS = -static
 
 SRC =	${libm17n_core_la_SOURCES} \