X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/177c0ea74342272645959b82cf219faa0b3dba16..7fbb47976eca08ae8fee6ac1a64ad961ef25d9f4:/leim/makefile.w32-in

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 0c338d19c1..00603fee62 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,12 +1,16 @@
-# Makefile for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-# Licensed to the Free Software Foundation.
+# -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007
+#   National Institute of Advanced Industrial Science and Technology (AIST)
+#   Registration Number H14PRO021
 
 # This file is part of GNU Emacs.
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -16,15 +20,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 srcdir=.
 
 # Where to install LEIM files.
 INSTALLDIR=$(INSTALL_DIR)/leim
 
-# On Xenix and the IBM RS6000, double-dot gets screwed up.
+# On IBM RS6000, double-dot gets screwed up.
 dot = .
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
@@ -116,7 +120,8 @@ MISC= \
 	$(srcdir)/quail/ethiopic.elc \
 	$(srcdir)/quail/ipa.elc \
 	$(srcdir)/quail/hebrew.elc \
-	$(srcdir)/quail/georgian.elc
+	$(srcdir)/quail/georgian.elc \
+	$(srcdir)/quail/sisheng.elc
 
 MISC_DIC=\
 	quail/tsang-b5.elc	\
@@ -142,7 +147,7 @@ NON_TIT=$(CHINESE_NON_TIT) $(JAPANESE) $(KOREAN) $(EUROPEAN) $(MISC)
 .el.elc:
 	$(RUN_EMACS) -f batch-byte-compile $<
 
-all: $(BUILT_EMACS) $(SUBDIRS) $(TIT) $(MISC_DIC) leim-list.el
+all: $(BUILT_EMACS) $(SUBDIRS) $(WORLD) leim-list.el
 
 # To ensure that we can run Emacs.  This target is ignored (never
 # being hit) if a user changes default value of EMACS.
@@ -162,6 +167,9 @@ $(SUBDIRS):
 .NO_PARALLEL: $(TIT) $(MISC_DIC)
 
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
+#
+# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
+#          this can break with GNU Make 3.81 and later if sh.exe is used.
 $(TIT):
 	$(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
 	    --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
@@ -176,9 +184,13 @@ $(MISC_DIC):
 	$(RUN_EMACS)  -l $(buildlisppath)/international/quail \
 	    -f batch-byte-compile $(MISC_DIC:.elc=.el)
 
-leim-list.el: $(SUBDIRS) $(WORLD)
+#
+# WARNING: Do NOT split the parts inside $(ARGQUOTE)s into multiple lines as
+#          this can break with GNU Make 3.81 and later if sh.exe is used.
+leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
 	$(RUN_EMACS) -l $(buildlisppath)/international/quail \
 	    --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)
+	$(RUN_EMACS) --eval $(ARGQUOTE)(w32-append-code-lines $(DQUOTE)$@$(DQUOTE) $(DQUOTE)$(srcdir)/leim-ext.el$(DQUOTE))$(ARGQUOTE)
 
 install: all
 	- mkdir "$(INSTALLDIR)"
@@ -192,12 +204,19 @@ install: all
 
 clean mostlyclean:
 	- $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
-	- $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
 	- $(FOREACH) $(MISC_DIC) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
 	- $(FOREACH) $(TIT:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
 	- $(FOREACH) $(MISC_DIC:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
 	- $(DEL) leim-list.el
 
-distclean maintainer-clean:
-	if exist stamp-subdir $(DELTREE) $(SUBDIRS)
+distclean: clean
+	- $(DELTREE) $(SUBDIRS)
 	- $(DEL) stamp-subdir
+
+maintainer-clean: distclean
+	- $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
+
+# We used to delete *~ here, but that might inadvertently remove
+# precious files if it happens to match their short 8+3 aliases.
+extraclean: maintainer-clean
+	- $(FOREACH) *.el~ "#*" $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)