From: handa Date: Wed, 30 Jun 2004 02:49:56 +0000 (+0000) Subject: (libm17n_X_la_LIBADD): Add ${X_LD_FLAGS} and X-Git-Tag: withdl~5 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08806a8eae5ed86ec8889291a3b19a2f97be4d50;p=m17n%2Fm17n-lib.git (libm17n_X_la_LIBADD): Add ${X_LD_FLAGS} and @XFT2_LD_FLAGS@. (libm17n_X_la_LIBADD): Delete aboves. (libm17n_gd_la_SOURCES): Add m17n-gd.h. (libm17n_gd_la_LIBADD): Add @GD_LD_FLAGS@. (libm17n_gd_la_LDFLAGS): Delete it. (include_HEADERS): Add m17n-gd.h. --- diff --git a/src/Makefile.am b/src/Makefile.am index 751d8a1..8c4c13c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,16 +73,17 @@ libm17n_gui_la_LIBADD = libm17n.la libm17n_gui_la_LDFLAGS = ${OPTIONAL_LD_FLAGS} ${VINFO} 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 = libm17n-gui.la ${X_LD_FLAGS} @XFT2_LD_FLAGS@ +libm17n_X_la_LDFLAGS = ${VINFO} -libm17n_gd_la_SOURCES = m17n-gd.c -libm17n_gd_la_LDFLAGS = -module @GD_LD_FLAGS@ ${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} AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\"" -include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h +include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h m17n-gd.h noinst_PROGRAMS = linkcore linkshell linkgui