(ALL_LDFLAGS): Add LDFLAGS.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c5c0024..41b323b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,6 +176,9 @@ INSTALL_DATA = @INSTALL_DATA@
 
 # ============================= Targets ==============================
 
+# What emacs should be called when installed.
+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.
@@ -192,7 +195,7 @@ SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefil
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-all:   src/paths.h ${SUBDIR}
+all:   src/paths.h ${SUBDIR} blessmail
 
 removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
 
@@ -217,7 +220,8 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
        @${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 
 src:   lib-src FRC.src
-lib-src: FRC.lib-src
+
+lib-src: FRC.lib-src src/paths.h
 
 .RECURSIVE: ${SUBDIR}
 
@@ -226,6 +230,9 @@ ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
 
+blessmail: ${SUBDIR_MAKEFILES} FRC
+       cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}'
+
 Makefile: Makefile.in config.status
        ./config.status
 
@@ -250,7 +257,7 @@ lwlib/Makefile: lwlib/Makefile.in config.status
 ## On AIX, use tar xBf.
 ## On Xenix, use tar xpf.
 
-.PHONY: install do-install mkdir
+.PHONY: install mkdir
 
 ## We delete each directory in ${COPYDESTS} before we copy into it;
 ## that way, we can reinstall over directories that have been put in
@@ -259,7 +266,7 @@ lwlib/Makefile: lwlib/Makefile.in config.status
 ## source exists and is distinct from the destination.
 ## We don't depend on `all', but rather on ${SUBDIR}, so that we won't
 ## ever modify src/paths.h.
-install: ${SUBDIR} do-install install-arch-dep install-arch-indep;
+install: ${SUBDIR} install-arch-dep install-arch-indep blessmail;
 
 ### Note that we copy the DOC-* files from the build etc directory
 ### as well as lots of things from ${srcdir}/etc.
@@ -270,8 +277,8 @@ install-arch-dep: mkdir
            archlibdir=${archlibdir})
        ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version}
        -chmod 1755  ${bindir}/emacs-${version}
-       rm -f ${bindir}/emacs
-       -ln ${bindir}/emacs-${version} ${bindir}/emacs
+       rm -f ${bindir}/$(EMACS)
+       -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
 
 ### Note that we copy the DOC-* files from the build etc directory
 ### as well as lots of things from ${srcdir}/etc.
@@ -310,7 +317,7 @@ install-arch-indep: mkdir
           if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
             (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
           fi ; \
-          for f in cl* emacs* dired-x* forms* gnus* info* sc* vip* ; do \
+          for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \
             (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
           done); \
        else true; fi
@@ -324,7 +331,7 @@ install-arch-indep: mkdir
 ### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
        ./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
-         ${bindir} ${datadir} ${libdir} \
+         ${bindir} ${datadir} ${docdir} ${libdir} \
          `echo ${locallisppath} | sed 's/:/ /'`
        -chmod 777 ${lockdir}
 
@@ -339,15 +346,17 @@ uninstall:
            prefix=${prefix} exec_prefix=${exec_prefix} \
            bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
        for dir in ${lispdir} ${etcdir} ; do            \
-         case `(cd $${dir} ; pwd)` in                  \
-           `(cd ${srcdir} ; pwd)`* ) ;;                \
-           * ) rm -rf $${dir} ;;                       \
-         esac ;                                        \
-         case $${dir} in                               \
-           ${datadir}/emacs/${version}/* )             \
-             rm -rf ${datadir}/emacs/${version}        \
-           ;;                                          \
-         esac ;                                        \
+         if [ -d $${dir} ]; then                       \
+           case `(cd $${dir} ; pwd)` in                \
+             `(cd ${srcdir} ; pwd)`* ) ;;              \
+             * ) rm -rf $${dir} ;;                     \
+           esac ;                                      \
+           case $${dir} in                             \
+             ${datadir}/emacs/${version}/* )           \
+               rm -rf ${datadir}/emacs/${version}      \
+             ;;                                        \
+           esac ;                                      \
+         fi ;                                          \
        done
        (cd ${infodir}; rm -f cl* emacs* forms* info* vip*)
        (cd ${mandir};  rm -f emacs.1 etags.1 ctags.1)
@@ -478,8 +487,7 @@ relock:
        (cd src; $(MAKE) $(MFLAGS) relock)
 
 TAGS tags:     lib-src
-       (cd ${srcdir}/src; \
-        ../lib-src/etags *.[ch] ../lisp/*.el ../lisp/term/*.el)
+       cd ${srcdir}/src; $(MAKE) tags
 
 check:
        @echo "We don't have any tests for GNU Emacs yet."