(all): Depends on $(WORLD) instead of $(TIT) and

$(MISC-DIC).
(clean, mostlyclean): Don't delete *.elc distributed with tarball.
(maintainer-clean): Delete files that are not in CVS repository.

2 files changed, 10 insertions, 6 deletions

diff --git a/leim/makefile.nt b/leim/makefile.nt
index 37939869f0c..41dc8e2030a 100644
--- a/leim/makefile.nt
+++ b/leim/makefile.nt
@@ -132,7 +132,7 @@ WORLD=$(ASIA) $(EUROPEAN) $(MISC)
 TIT=$(CHINESE_TIT)
 NON_TIT=$(CHINESE_NON_TIT) $(JAPANESE) $(KOREAN) $(EUROPEAN) $(MISC)
 
-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.
@@ -196,11 +196,13 @@ clean mostlyclean:
         for %%f in ($(TIT_EL:/=\)) do $(DEL) %%f
         for %%f in ($(MISC_DIC:/=\)) do $(DEL) %%f
         for %%f in ($(MISC_DIC_EL:/=\)) do $(DEL) %%f
-        for %%f in ($(WORLD:/=\)) do $(DEL) %%f
         $(DEL) leim-list.el
 
-distclean maintainer-clean:
+distclean: clean
         if exist stamp-subdir $(DELTREE) $(SUBDIRS)
         $(DEL) stamp-subdir
 
+maintainer-clean: distclean
+        for %%f in ($(WORLD:/=\)) do $(DEL) %%f
+
 # arch-tag: cded53b4-4803-496b-8c05-7daff80e5b3b
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 5d273377f12..f19aceb4f82 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -142,7 +142,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.
@@ -192,14 +192,16 @@ 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:
+distclean clean:
         if exist stamp-subdir $(DELTREE) $(SUBDIRS)
         - $(DEL) stamp-subdir
 
+maintainer-clean: distclean
+        - $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
+
 # arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b