From ad0e0a61cb68aaacdda4d05983fa805cc7e90c01 Mon Sep 17 00:00:00 2001 From: handa Date: Tue, 6 Jul 2004 11:37:14 +0000 Subject: [PATCH] (libm17n_core_la_LIBADD): New variable. (libm17n_core_la_LDFLAGS): Add -export-dynamic, move @XML2_LD_FLAGS@ to above. (libm17n_la_LIBADD): Add -ldl. (libm17n_la_LDFLAGS): Add -export-dynamic. (X_LD_FLAGS): Fix the order of linking. (libm17n_gui_la_LIBADD): Add ${OPTIONAL_LD_FLAGS}. (libm17n_gui_la_LDFLAGS): Add -export-dynamic, delete above. (libm17n_X_la_LDFLAGS): Add -module. (libm17n_gd_la_SOURCES): Delete m17n-gd.h. (libm17n_gd_la_LIBADD): Add @GD_LD_FLAGS@. (libm17n_gd_la_LDFLAGS): Add -module. (include_HEADERS): Delete m17n-gd.h. --- src/Makefile.am | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8c4c13c..3239c0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,8 @@ libm17n_core_la_SOURCES = \ symbol.h symbol.c \ textprop.h textprop.c -libm17n_core_la_LDFLAGS = @XML2_LD_FLAGS@ ${VINFO} +libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ +libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO} libm17n_la_SOURCES = \ charset.h charset.c \ @@ -49,8 +50,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 = libm17n-core.la -ldl +libm17n_la_LDFLAGS = -export-dynamic ${VINFO} GUI_SOURCES = \ face.h face.c \ @@ -61,7 +62,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,21 +69,23 @@ 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} 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 ${X_LD_FLAGS} @XFT2_LD_FLAGS@ -libm17n_X_la_LDFLAGS = ${VINFO} +libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ libm17n-gui.la +libm17n_X_la_LDFLAGS = -module ${VINFO} -libm17n_gd_la_SOURCES = m17n-gd.h m17n-gd.c -libm17n_gd_la_LIBADD = libm17n-gui.la @GD_LD_FLAGS@ -libm17n_gd_la_LDFLAGS = ${VINFO} +libm17n_gd_la_SOURCES = m17n-gd.c +libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ libm17n-gui.la +libm17n_gd_la_LDFLAGS = -module ${VINFO} AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\"" -include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h m17n-gd.h +include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h noinst_PROGRAMS = linkcore linkshell linkgui -- 1.7.10.4