From: handa <handa>
Date: Wed, 2 Aug 2006 11:53:44 +0000 (+0000)
Subject: (libm17n_la_LIBADD, libm17n_gui_la_LIBADD)
X-Git-Tag: REL-1-3-4~95
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c2b1f443a9545ac18b40331e5f97f56bdd5fdc;p=m17n%2Fm17n-lib.git

(libm17n_la_LIBADD, libm17n_gui_la_LIBADD)
(libm17n_X_la_LIBADD, libm17n_gd_la_LIBADD, linkcore_LDADD)
(linkshell_LDADD, linkgui_LDADD): Use ${top_builddir}.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1025eca..9b3d85f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
 	language.h language.c \
 	mlocale.h locale.c \
 	m17n.h m17n.c
-libm17n_la_LIBADD = ${top_srcdir}/src/libm17n-core.la -ldl
+libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
 libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
 
 GUI_SOURCES = \
@@ -72,17 +72,17 @@ OPTIONAL_LD_FLAGS = \
 	@FONTCONFIG_LD_FLAGS@
 
 libm17n_gui_la_SOURCES = ${GUI_SOURCES}
-libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_srcdir}/src/libm17n.la
+libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${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}
 
 libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_srcdir}/src/libm17n-gui.la
+libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/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_LIBADD = @GD_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la
 libm17n_gd_la_LDFLAGS = -module ${VINFO}
 
 AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\""
@@ -108,14 +108,14 @@ if MAINTAINER_MODE
 noinst_PROGRAMS = linkcore linkshell linkgui
 
 linkcore_SOURCES = linkcore.c
-linkcore_LDADD = ${top_srcdir}/src/libm17n-core.la
+linkcore_LDADD = ${top_builddir}/src/libm17n-core.la
 linkcore_LDFLAGS = -static
 
 linkshell_SOURCES = linkshell.c
-linkshell_LDADD = ${top_srcdir}/src/libm17n.la
+linkshell_LDADD = ${top_builddir}/src/libm17n.la
 linkshell_LDFLAGS = -static
 
 linkgui_SOURCES = linkgui.c
-linkgui_LDADD = ${top_srcdir}/src/libm17n-gui.la
+linkgui_LDADD = ${top_builddir}/src/libm17n-gui.la
 linkgui_LDFLAGS = -static
 endif