(find-buffer-file-type-coding-system):

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0ba5418..95cb7a0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,13 +186,14 @@ EMACS = emacs
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
 # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
+SUBDIR = lib-src src leim
 
 # The makefiles of the directories in $SUBDIR.
-SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
+SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
+# leim's makefile also knows how to install it, so we don't do that here.
 # When installing the info files, we need to do special things to
 # avoid nuking an existing dir file, so we don't do that here;
 # instead, we have written out explicit code in the `install' targets.
@@ -220,7 +221,7 @@ paths-force: FRC
 
 src:   lib-src FRC
 
-lib-src: FRC
+lib-src: FRC src/config.stamp
 
 .RECURSIVE: ${SUBDIR}
 
@@ -239,6 +240,10 @@ Makefile: Makefile.in config.status
 src/Makefile: src/Makefile.in config.status
        ./config.status
 
+src/config.stamp: src/config.in config.status
+       ./config.status
+       touch src/config.stamp
+
 lib-src/Makefile: lib-src/Makefile.in config.status
        ./config.status
 
@@ -248,6 +253,9 @@ oldXMenu/Makefile: oldXMenu/Makefile.in config.status
 lwlib/Makefile: lwlib/Makefile.in config.status
        ./config.status
 
+leim/Makefile: leim/Makefile.in config.status
+       ./config.status
+
 # ==================== Installation ====================
 
 ## If we let lib-src do its own installation, that means we
@@ -266,7 +274,7 @@ lwlib/Makefile: lwlib/Makefile.in config.status
 ## source exists and is distinct from the destination.
 ### We do install-arch-indep first because
 ### the executable needs the Lisp files and DOC file to work properly.
-install: all install-arch-indep install-arch-dep blessmail
+install: all install-arch-indep install-arch-dep blessmail install-leim
        @true
 
 ### Install the executables that were compiled specifically for this machine.
@@ -286,10 +294,10 @@ install-arch-dep: mkdir
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution;
 ### the exception is the DOC-* files, which are copied
-### from the build directory.
+## from the build directory.
 
-### Note that we copy DOC* and then delete DOC
-### as a workaround for a bug in tar on Ultrix 4.2.
+## Note that we copy DOC* and then delete DOC
+## as a workaround for a bug in tar on Ultrix 4.2.
 install-arch-indep: mkdir
        -set ${COPYDESTS} ; \
        for dir in ${COPYDIR} ; do \
@@ -360,6 +368,13 @@ install-arch-indep: mkdir
           chmod a+r ${man1dir}/$${page}${manext}); \
        done
 
+### Install LEIM files.  Although they are machine-independent, we
+### have separate target here instead of including it in
+### `install-arch-indep'.  People who extracted LEIM files after they
+### insalled Emacs itself can install only LEIM files by this target.
+install-leim: leim/Makefile
+       cd leim; $(MAKE) install
+
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
        $(MAKE) INSTALL_STRIP=-s
@@ -419,6 +434,7 @@ mostlyclean: FRC
        (cd lwlib;    $(MAKE) $(MFLAGS) mostlyclean)
        (cd lib-src;  $(MAKE) $(MFLAGS) mostlyclean)
        -(cd man &&   $(MAKE) $(MFLAGS) mostlyclean)
+       (cd leim;     $(MAKE) $(MFLAGS) mostlyclean)
 
 ### `clean'
 ###      Delete all files from the current directory that are normally
@@ -434,6 +450,7 @@ clean: FRC
        (cd lwlib;    $(MAKE) $(MFLAGS) clean)
        (cd lib-src;  $(MAKE) $(MFLAGS) clean)
        -(cd man &&   $(MAKE) $(MFLAGS) clean)
+       (cd leim;     $(MAKE) $(MFLAGS) clean)
 
 ### `distclean'
 ###      Delete all files from the current directory that are created by
@@ -451,6 +468,7 @@ distclean: FRC
        (cd lwlib;    $(MAKE) $(MFLAGS) distclean)
        (cd lib-src;  $(MAKE) $(MFLAGS) distclean)
        (cd man &&    $(MAKE) $(MFLAGS) distclean)
+       (cd leim;     $(MAKE) $(MFLAGS) distclean)
        ${top_distclean}
 
 ### `maintainer-clean'
@@ -470,6 +488,7 @@ maintainer-clean: FRC
        (cd lwlib;    $(MAKE) $(MFLAGS) maintainer-clean)
        (cd lib-src;  $(MAKE) $(MFLAGS) maintainer-clean)
        -(cd man &&   $(MAKE) $(MFLAGS) maintainer-clean)
+       (cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
        ${top_distclean}
 
 ### This doesn't actually appear in the coding standards, but Karl
@@ -528,7 +547,6 @@ check:
        @echo "We don't have any tests for GNU Emacs yet."
 
 dist:
-       $(srcdir)/update-subdirs ${srcdir}/lisp
        cd ${srcdir}; make-dist
 
 .PHONY: info dvi dist check