From 452e0b9823daf2cd239f6da212387229106cafdb Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Mon, 5 Sep 2005 00:31:05 +0000
Subject: [PATCH] (X_LD_FLAGS): Use @X11_LD_FLAGS@ instead of directory
 listing libraries. (noinst_PROGRAMS): Define it only in
 maintainer mode.

---
 src/Makefile.am |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 827ac9a..e56c7ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,7 @@ libm17n_gui_la_SOURCES = ${GUI_SOURCES}
 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}
+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
@@ -88,6 +88,16 @@ AM_CPPFLAGS = -DM17NDIR="\"@M17NDIR@\""
 
 include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h
 
+SRC =	${libm17n_core_la_SOURCES} \
+	${libm17n_la_SOURCES} \
+	${libm17n_gui_la_SOURCES} \
+	${libm17n_X_la_SOURCES} \
+	${libm17n_gd_la_SOURCES}
+
+TAGS: ${SRC}
+	etags ${SRC}
+
+if MAINTAINER_MODE
 noinst_PROGRAMS = linkcore linkshell linkgui
 
 linkcore_SOURCES = linkcore.c
@@ -101,12 +111,4 @@ linkshell_LDFLAGS = -static
 linkgui_SOURCES = linkgui.c
 linkgui_LDADD = ${top_srcdir}/src/libm17n-gui.la
 linkgui_LDFLAGS = -static
-
-SRC =	${libm17n_core_la_SOURCES} \
-	${libm17n_la_SOURCES} \
-	${libm17n_gui_la_SOURCES} \
-	${libm17n_X_la_SOURCES} \
-	${libm17n_gd_la_SOURCES}
-
-TAGS: ${SRC}
-	etags ${SRC}
+endif
-- 
1.7.10.4