[uim-commit] r2269 - in trunk: . emacs xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-27 22:00:28 -0800 (Sun, 27 Nov 2005)
New Revision: 2269

Modified:
   trunk/autogen.sh
   trunk/emacs/Makefile.am
   trunk/xim/Makefile.am
Log:
* emacs/Makefile.am : Use lisp_DATA.
* xim/Makefile.am : Move EXTRA_DIST out of 'if XIM'.
* autogen.sh : Remove version specifier.


Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2005-11-28 05:29:45 UTC (rev 2268)
+++ trunk/autogen.sh	2005-11-28 06:00:28 UTC (rev 2269)
@@ -1,6 +1,6 @@
-aclocal-1.7 -I m4 \
+aclocal -I m4 \
   && libtoolize --force --copy \
   && autoheader \
-  && automake-1.7 --add-missing --foreign --copy \
+  && automake --add-missing --foreign --copy \
   && autoconf \
   && ./configure $@

Modified: trunk/emacs/Makefile.am
===================================================================
--- trunk/emacs/Makefile.am	2005-11-28 05:29:45 UTC (rev 2268)
+++ trunk/emacs/Makefile.am	2005-11-28 06:00:28 UTC (rev 2269)
@@ -1,10 +1,10 @@
-EXTRA_DIST = README.jp $(uimel_target)
+EXTRA_DIST = README.jp
 
 if UIM_EL
 
-uimel_target = uim.el uim-var.el uim-keymap.el uim-key.el uim-util.el uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el
-uimeldir = $(UIMEL_LISP_DIR)
-uimel_DATA = $(uimel_target)
+uimel_lispdir = $(UIMEL_LISP_DIR)
+dist_uimel_lisp_DATA = uim.el uim-var.el uim-keymap.el uim-key.el uim-util.el \
+ uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el
 
 bin_PROGRAMS = uim-el-agent
 

Modified: trunk/xim/Makefile.am
===================================================================
--- trunk/xim/Makefile.am	2005-11-28 05:29:45 UTC (rev 2268)
+++ trunk/xim/Makefile.am	2005-11-28 06:00:28 UTC (rev 2269)
@@ -1,3 +1,5 @@
+EXTRA_DIST = uim-xim.1
+
 if XIM
 
 bin_PROGRAMS = uim-xim
@@ -7,7 +9,6 @@
 uim_xim_CFLAGS = @X_CFLAGS@ -Wall
 uim_xim_CXXFLAGS = @X_CFLAGS@ -Wall
 man1_MANS = uim-xim.1
-EXTRA_DIST = uim-xim.1
 
 if DEFAULT_TOOLKIT_GTK
 uim_xim_CPPFLAGS += -DUSE_GTK_CANDWIN