From: handa <handa>
Date: Mon, 29 Oct 2007 02:09:29 +0000 (+0000)
Subject: (GUI_SOURCES): Delete font-flt.c.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bb490995b1857052bc39479ad20f41e553829e0b;p=m17n%2Fm17n-lib.git

(GUI_SOURCES): Delete font-flt.c.
(libm17n_gui_la_LIBADD): Add ${top_builddir}/src/libm17n-flt.la.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index bf30dc1..d626b86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,9 +56,16 @@ libm17n_la_SOURCES = \
 libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
 libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
 
+FLT_SOURCES = \
+	m17n-flt.h m17n-flt.c
+
+libm17n_flt_la_SOURCES = ${FLT_SOURCES}
+libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la
+libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
+
 GUI_SOURCES = \
 	face.h face.c \
-	font.h font.c font-ft.c font-flt.c \
+	font.h font.c font-ft.c \
 	fontset.h fontset.c \
 	draw.c \
 	input-gui.c \
@@ -72,7 +79,7 @@ OPTIONAL_LD_FLAGS = \
 	@FONTCONFIG_LD_FLAGS@
 
 libm17n_gui_la_SOURCES = ${GUI_SOURCES}
-libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n.la
+libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n.la
 libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
 
 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
@@ -85,13 +92,6 @@ libm17n_gd_la_SOURCES = m17n-gd.c
 libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la
 libm17n_gd_la_LDFLAGS = -module ${VINFO}
 
-FLT_SOURCES = \
-	m17n-flt.h m17n-flt.c
-
-libm17n_flt_la_SOURCES = ${FLT_SOURCES}
-libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la
-libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
-
 AM_CPPFLAGS = -DM17NDIR=\"@M17NDIR@\" -DGETTEXTDIR=\"@GETTEXTDIR@\"