From: handa <handa>
Date: Fri, 23 Jun 2006 12:27:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-3-4~159
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ec018ddc68fd56e55ef2c83bcb62eb9456c41a6;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/Makefile.am b/Makefile.am
index 2f0d5cb..e841efd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,10 @@ EXTRA_DIST = \
 
 pkgconfigdir = ${libdir}/pkgconfig
 
+BASICDATA = m17n-core.pc m17n-shell.pc
 if WITH_GUI
-PKGDATA = m17n-core.pc m17n-shell.pc m17n-gui.pc
+PKGDATA = $(BASICDATA) m17n-gui.pc
 else
-PKGDATA = m17n-core.pc m17n-shell.pc
+PKGDATA = $(BASICDATA)
 endif
 pkgconfig_DATA = $(PKGDATA)
diff --git a/example/Makefile.am b/example/Makefile.am
index 88f8b7e..225911c 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -25,9 +25,11 @@
 ## Note: Source files have preifx "m" but executables have prefix
 ## "m17n-" to avoid confliction of program names.
 
-bin_PROGRAMS = m17n-conv
+BASICPROGS = m17n-conv
 if WITH_GUI
-bin_PROGRAMS += m17n-view m17n-date m17n-dump m17n-edit
+bin_PROGRAMS = $(BASICPROGS) m17n-view m17n-date m17n-dump m17n-edit
+else
+bin_PROGRAMS = $(BASICPROGS)
 endif
 
 common_ldflags = ${top_srcdir}/src/libm17n-core.la ${top_srcdir}/src/libm17n.la
@@ -63,9 +65,11 @@ EXTRA_DIST = \
 
 VINFO = -version-info @API_VERSION@
 
-BUILD_LIBS = libmimx-anthy.la
+BASIC_BUILD_LIBS = libmimx-anthy.la
 if WITH_GUI
-BUILD_LIBS += libmimx-ispell.la 
+BUILD_LIBS = $(BASIC_BUILD_LIBS) libmimx-ispell.la 
+else
+BUILD_LIBS = $(BASIC_BUILD_LIBS)
 endif
 lib_LTLIBRARIES = $(BUILD_LIBS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c3088a6..e1680c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,11 @@
 
 VINFO = -version-info @API_VERSION@
 
-BUILD_LIBS = libm17n-core.la libm17n.la
+BASIC_BUILD_LIBS = libm17n-core.la libm17n.la
 if WITH_GUI
-BUILD_LIBS += libm17n-gui.la libm17n-X.la libm17n-gd.la
+BUILD_LIBS = $(BASIC_BUILD_LIBS) libm17n-gui.la libm17n-X.la libm17n-gd.la
+else
+BUILD_LIBS = $(BASIC_BUILD_LIBS)
 endif
 
 lib_LTLIBRARIES = $(BUILD_LIBS)