X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5725bd2cc0e691dadc31bd958f210b1bbcf17c49..36a8b68b3381b77971c0fd655a8e7f41ecc58426:/Makefile.in diff --git a/Makefile.in b/Makefile.in index ab9f16c035..42b900401f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # DIST: make most of the changes to this file you might want, so try # DIST: that first. -# Copyright (C) 1992-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-2013 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -54,6 +54,9 @@ # make bootstrap # Removes all the compiled files to force a new bootstrap from a # clean slate, and then build in the normal way. +# +# make docs +# Make Emacs documentation files from their sources; requires makeinfo. SHELL = /bin/sh @@ -246,6 +249,7 @@ INSTALL_INFO = @INSTALL_INFO@ # By default, we uphold the dignity of our programs. INSTALL_STRIP = MKDIR_P = @MKDIR_P@ +LN_S = @LN_S@ # We use gzip to compress installed .el files. GZIP_PROG = @GZIP_PROG@ @@ -258,8 +262,9 @@ GZIP_INFO = @GZIP_INFO@ TRANSFORM = @program_transform_name@ # What emacs should be called when installed. -EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'` -EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` +EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` +EMACS = ${EMACS_NAME}${EXEEXT} +EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT} # Subdirectories to make recursively. SUBDIR = lib lib-src src lisp leim @@ -354,19 +359,23 @@ blessmail: Makefile src FRC # config.status overrides MAKEFILE_NAME with a bogus name when creating # src/epaths.h, so that 'make epaths-force' does not recursively invoke # config.status and overwrite config.status while executing it (Bug#11214). +# +# 'make bootstrap' overrides MAKEFILE_NAME to a nonexistent file but +# then attempts to build that file. This forces 'Makefile', 'lib/Makefile', +# etc. to be built without running into similar recursion problems. MAKEFILE_NAME = Makefile $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ - $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) - ./config.status + $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk + MAKE='$(MAKE)' ./config.status -# Don't erase config.status if make is interrupted while refreshing it. -.PRECIOUS: config.status +# Don't erase these files if make is interrupted while refreshing them. +.PRECIOUS: Makefile config.status config.status: ${srcdir}/configure ${srcdir}/lisp/version.el if [ -x ./config.status ]; then \ ./config.status --recheck; \ else \ - ./configure $(CONFIGURE_FLAGS); \ + $(srcdir)/configure $(CONFIGURE_FLAGS); \ fi AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 @@ -382,6 +391,10 @@ AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \ $(srcdir)/lib/gnulib.mk $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) cd $(srcdir) && automake --gnu -a -c lib/Makefile + +# Regenerate files that this makefile would have made, if this makefile +# had been built by Automake. The name 'am--refresh' is for +# compatibility with subsidiary Automake-generated makefiles. am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in .PHONY: am--refresh @@ -426,7 +439,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \ ### Install the executables that were compiled specifically for this machine. ### We do install-arch-indep first because the executable needs the ### Lisp files and DOC file to work properly. -install-arch-dep: install-arch-indep install-doc +install-arch-dep: src install-arch-indep install-doc umask 022; ${MKDIR_P} $(DESTDIR)${bindir} cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ @@ -435,9 +448,11 @@ install-arch-dep: install-arch-indep install-doc INSTALL_STRIP=${INSTALL_STRIP} if test "${ns_self_contained}" = "no"; then \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ - chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ - rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ - ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ + chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \ + if test "x${NO_BIN_LINK}" = x; then \ + rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ + cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \ + fi; \ else \ subdir=${ns_appresdir}/site-lisp; \ ${write_subdir} || exit 1; \ @@ -493,7 +508,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## work correctly, and therefore no idea when tar can be replaced. ## See also these comments from 2004 about cp -r working fine: ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html -install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} +install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} umask 022 ; \ locallisppath='${locallisppath}'; \ IFS=:; \ @@ -522,6 +537,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} tar -xvf - && cat > /dev/null) || exit 1; \ [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ for subdir in `find $${dest} -type d -print` ; do \ + chmod a+rx $${subdir} ; \ rm -f $${subdir}/.gitignore ; \ rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.DS_Store ; \ @@ -556,7 +572,9 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} done ) -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} -# The last chmod isn't needed at present. +## The above chmods are needed because "umask 022; tar ..." is not +## guaranteed to do the right thing; eg if we are root and tar is +## preserving source permissions. ## We install only the relevant DOC file if possible ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. @@ -564,7 +582,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} ## Note that install-arch-indep deletes and recreates the entire ## installed etc/ directory, so we need it to run before this does. -install-doc: install-arch-indep +install-doc: src install-arch-indep -unset CDPATH; \ umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ @@ -591,7 +609,7 @@ install-info: info [ -f dir ] || \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ - info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \ + info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \ cd ${srcdir}/info ; \ for elt in ${INFO_NONMISC} $${info_misc}; do \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ @@ -611,27 +629,40 @@ install-man: thisdir=`/bin/pwd`; \ cd ${mansrcdir}; \ for page in *.1; do \ + dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \ + ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ - rm -f $(DESTDIR)${man1dir}/$${page}.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \ + rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ + ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \ done ## Install those items from etc/ that need to end up elsewhere. + +## If you prefer, choose "emacs22" at installation time. +## Note: emacs22 does not have all the resolutions. +EMACS_ICON=emacs + install-etc: umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} - ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \ - $(DESTDIR)${desktopdir}/emacs.desktop + tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ + emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \ + sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \ + -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \ + ${srcdir}/etc/emacs.desktop > $${tmp}; \ + ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \ + rm -f $${tmp} thisdir=`/bin/pwd`; \ cd ${iconsrcdir} || exit 1; umask 022 ; \ for dir in */*/apps */*/mimetypes; do \ [ -d $${dir} ] || continue ; \ ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ - for icon in $${dir}/*.*; do \ + for icon in $${dir}/${EMACS_ICON}[.-]*; do \ [ -r $${icon} ] || continue ; \ + ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \ + dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \ ( cd $${thisdir}; \ - ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \ + ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \ || exit 1; \ done ; \ done @@ -665,22 +696,29 @@ uninstall: done -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} thisdir=`/bin/pwd`; \ - (info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \ - cd $(DESTDIR)${infodir} && \ - for elt in ${INFO_NONMISC} $${info_misc}; do \ - (cd $${thisdir}; \ - $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ - if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ - ext=.gz; else ext=; fi; \ - rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \ - done;) + (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \ + if cd $(DESTDIR)${infodir}; then \ + for elt in ${INFO_NONMISC} $${info_misc}; do \ + (cd $${thisdir}; \ + $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ + if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ + ext=.gz; else ext=; fi; \ + rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \ + done; \ + fi) (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ ext=.gz; else ext=; fi; \ - cd ${mansrcdir} && for page in *.1; do \ - rm -f $(DESTDIR)${man1dir}/$$page$$ext; done ) - (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS)) - (cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg ) - -rm -f $(DESTDIR)${desktopdir}/emacs.desktop + if cd ${mansrcdir}; then \ + for page in *.1; do \ + rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \ + fi) + (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true) + (if cd $(DESTDIR)${icondir}; then \ + rm -f hicolor/*x*/apps/${EMACS_NAME}.png \ + hicolor/scalable/apps/${EMACS_NAME}.svg \ + hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \ + fi) + -rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop for file in snake-scores tetris-scores; do \ file=$(DESTDIR)${gamedir}/$${file}; \ [ -s $${file} ] || rm -f $$file; \ @@ -718,6 +756,7 @@ mostlyclean: FRC ### ### Delete `.dvi' files here if they are not part of the distribution. clean: FRC + -rm -f etc/emacs.tmpdesktop (cd src; $(MAKE) $(MFLAGS) clean) (cd oldXMenu; $(MAKE) $(MFLAGS) clean) (cd lwlib; $(MAKE) $(MFLAGS) clean) @@ -728,6 +767,7 @@ clean: FRC -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) + (cd nextstep && $(MAKE) $(MFLAGS) clean) ### `bootclean' ### Delete all files that need to be remade for a clean bootstrap. @@ -754,6 +794,7 @@ distclean: FRC (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) + (cd nextstep && $(MAKE) $(MFLAGS) distclean) ${top_distclean} ### `bootstrap-clean' @@ -771,10 +812,9 @@ bootstrap-clean: FRC -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) + (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) [ ! -f config.log ] || mv -f config.log config.log~ ${top_bootclean} -## configure; make bootstrap replaces the real config.log from configure -## with the truncated one from config.status. The former is more useful. ### `maintainer-clean' ### Delete everything from the current directory that can be @@ -822,13 +862,25 @@ check: dist: cd ${srcdir}; ./make-dist +DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi +HTMLS = lispref-html lispintro-html emacs-html misc-html +INFOS = lispref-info lispintro-info emacs-info misc-info +PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf +PSS = lispref-ps lispintro-ps emacs-ps # no misc-ps + +DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) +$(DOCS): + t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 + +.PHONY: $(DOCS) docs pdf ps .PHONY: info dvi dist check html info-real force-info check-info-dir -info-real: - (cd doc/emacs; $(MAKE) $(MFLAGS) info) - (cd doc/misc; $(MAKE) $(MFLAGS) info) - (cd doc/lispref; $(MAKE) $(MFLAGS) info) - (cd doc/lispintro; $(MAKE) $(MFLAGS) info) +docs: $(DOCS) +dvi: $(DVIS) +html: $(HTMLS) +info-real: $(INFOS) +pdf: $(PDFS) +ps: $(PSS) force-info: # Note that man/Makefile knows how to put the info files in $(srcdir), @@ -867,12 +919,6 @@ check-info-dir: info fi ; \ echo "info/dir is OK" -dvi: - (cd doc/emacs; $(MAKE) $(MFLAGS) dvi) - (cd doc/misc; $(MAKE) $(MFLAGS) dvi) - (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi) - (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) - #### Bootstrapping. ### This first cleans the lisp subdirectory, removing all compiled @@ -880,14 +926,14 @@ dvi: .PHONY: bootstrap -## configure; make bootstrap replaces the real config.log from configure -## with the truncated one from config.status. The former is more useful. +# Bootstrapping does the following: +# * Remove files to start from a bootstrap-clean slate. +# * Run autogen.sh, falling back on copy_autogen if autogen.sh fails. +# * Rebuild Makefile, to update the build procedure itself. +# * Do the actual build. bootstrap: bootstrap-clean FRC - if [ -x ./config.status ]; then \ - ./config.status; \ - else \ - ./configure $(CONFIGURE_FLAGS); \ - fi + cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; } + $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile $(MAKE) $(MFLAGS) info all .PHONY: check-declare