From: handa <handa>
Date: Fri, 7 May 2004 04:47:15 +0000 (+0000)
Subject: (libm17n_la_LIBADD): Include -ldl.
X-Git-Tag: withdl~232
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ac86587c08c1f027d1ef94cfa5a9f89fb7ff60f;p=m17n%2Fm17n-lib.git

(libm17n_la_LIBADD): Include -ldl.
(libm17n_la_LDFLAGS): Delete it.
(noinst_PROGRAMS): Renamed from bin_PROGRAMS.
(install-binPROGRAMS, uninstall-binPROGRAMS): Delete them.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 0254043..40dd5fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,8 +42,7 @@ libm17n_la_SOURCES = \
 	language.h language.c \
 	mlocale.h locale.c \
 	m17n.h m17n.c
-libm17n_la_LIBADD = libm17n-core.la
-libm17n_la_LDFLAGS = -ldl
+libm17n_la_LIBADD = libm17n-core.la -ldl
 
 GUI_SOURCES = \
 	face.h face.c \
@@ -69,7 +68,7 @@ include_HEADERS = m17n-core.h m17n.h m17n-misc.h m17n-gui.h m17n-X.h
 
 AM_CPPFLAGS = -DM17NDIR="\"$(datadir)/m17n\""
 
-bin_PROGRAMS = linkcore linkshell linkgui
+noinst_PROGRAMS = linkcore linkshell linkgui
 
 linkcore_SOURCES = linkcore.c
 linkcore_LDADD = libm17n-core.la
@@ -83,10 +82,6 @@ linkgui_SOURCES = linkgui.c
 linkgui_LDADD = libm17n-X.la
 #linkgui_LDFLAGS = -static
 
-# We should not install the above test programs.
-install-binPROGRAMS:
-uninstall-binPROGRAMS:
-
 SRC = ${libm17n_core_la_SOURCES} ${libm17n_la_SOURCES} ${libm17n_X_la_SOURCES}
 
 TAGS: ${SRC}