[uim-commit] r356 - trunk/scm

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-26 05:33:05 -0800 (Wed, 26 Jan 2005)
New Revision: 356

Modified:
   trunk/scm/Makefile.am
Log:
* scm/Makefile.am
  - Fix build script for enabled-ims.scm. Thanks UTUMI Hirosi and
    No.143 of [Anthy/uim thread 5] for reporting


Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-01-26 07:02:28 UTC (rev 355)
+++ trunk/scm/Makefile.am	2005-01-26 13:33:05 UTC (rev 356)
@@ -59,16 +59,17 @@
 endif
 
 installed-modules.scm:
-	echo ";; The described order of input methods affects which IM is preferred" >$@
-	echo ";; at the default IM selection process for each locale. i.e. list" >>$@
-	echo ";; preferable IM first for each language" >>$@
-	echo -n "(define installed-im-module-list '(" >>$@
-	echo -n '$(module_names)' >>$@
+	echo ";; The described order of input methods affects which IM is preferred" >$@ && \
+	echo ";; at the default IM selection process for each locale. i.e. list" >>$@ && \
+	echo ";; preferable IM first for each language" >>$@ && \
+	echo -n "(define installed-im-module-list '(" >>$@ && \
+	echo -n '$(module_names)' >>$@ && \
 	echo '))' >>$@
 
-# TODO: resolve dependency to $(top_builddir)/uim/uim-sh
+# TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
 enabled-ims.scm: installed-modules.scm
-	echo ";; Don't edit this file manually" >$@
+	$(MAKE) -C $(top_builddir)/uim uim-sh && \
+	echo ";; Don't edit this file manually" >$@ && \
 	echo '(require "custom.scm") \
 	      (puts (custom-hook-literalize-enabled-im-list))' \
 	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=${PWD} \