From f313c487cf89f9ac4006c4ded18b9b6e55125c67 Mon Sep 17 00:00:00 2001 From: handa Date: Sun, 18 Jul 2004 07:43:16 +0000 Subject: [PATCH] Prepend ${top_srcdir} to all *.la in *_LIBADD/*_LDADD. --- src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3239c0b..ef02e45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ libm17n_la_SOURCES = \ language.h language.c \ mlocale.h locale.c \ m17n.h m17n.c -libm17n_la_LIBADD = libm17n-core.la -ldl +libm17n_la_LIBADD = ${top_srcdir}/src/libm17n-core.la -ldl libm17n_la_LDFLAGS = -export-dynamic ${VINFO} GUI_SOURCES = \ @@ -69,17 +69,17 @@ OPTIONAL_LD_FLAGS = \ @FONTCONFIG_LD_FLAGS@ libm17n_gui_la_SOURCES = ${GUI_SOURCES} -libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} libm17n.la +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 = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ libm17n-gui.la +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@ libm17n-gui.la +libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ ${top_srcdir}/src/libm17n-gui.la libm17n_gd_la_LDFLAGS = -module ${VINFO} AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\"" @@ -90,15 +90,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} \ -- 1.7.10.4