X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bc171472fa0af653f8e914c36c1b45f991a46305..5cc679abf39af50a947ff77542122aa9112bd1d4:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 389e08e37c..85f2425c81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # DIST: that first. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001 Free Software Foundation, Inc. +# 2000, 2001, 2002 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -121,6 +121,9 @@ man1dir=$(mandir)/man1 # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ +# Directory for local state files for all programs. +localstatedir=@localstatedir@ + # Where to look for bitmap files. bitmapdir=@bitmapdir@ @@ -138,6 +141,9 @@ VPATH=@srcdir@ # Where to find the application default. x_default_search_path=@x_default_search_path@ +# Location to install Emacs.app on Mac OS X +carbon_appdir=@carbon_appdir@ + # ==================== Emacs-specific directories ==================== # These variables hold the values Emacs will actually use. They are @@ -190,29 +196,35 @@ archlibdir=@archlibdir@ # Where to put the docstring file. docdir=@docdir@ +# Where to install Emacs game score files. +gamedir=@gamedir@ + # ==================== Utility Programs for the Build ==================== # Allow the user to specify the install program. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_INFO = install-info +INSTALL_INFO = @INSTALL_INFO@ # By default, we uphold the dignity of our programs. INSTALL_STRIP = # ============================= Targets ============================== +# Program name transformation. +TRANSFORM = @program_transform_name@ + # What emacs should be called when installed. -EMACS = emacs +EMACS = `echo emacs | sed '$(TRANSFORM)'` +EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'` # 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. +# because the compiled lisp files are part of the distribution. # leim is not included because it needs special handling. SUBDIR = lib-src src # The makefiles of the directories in $SUBDIR. -SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile +SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/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. @@ -223,6 +235,9 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = ${etcdir} ${lispdir} +# Set to FRC to force running autoconf and autoheader +MAINT = + all: ${SUBDIR} leim removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' @@ -232,6 +247,7 @@ epaths-force: FRC @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ x_default_search_path=`echo ${x_default_search_path}`; \ + gamedir=`echo ${gamedir}`; \ sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ @@ -240,6 +256,7 @@ epaths-force: FRC -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ + -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h @@ -258,7 +275,7 @@ lib-src: FRC src/config.stamp .RECURSIVE: ${SUBDIR} leim -${SUBDIR}: ${SUBDIR_MAKEFILES} FRC +${SUBDIR}: maybe_bootstrap ${SUBDIR_MAKEFILES} FRC cd $@; $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' @@ -273,9 +290,16 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: ${srcdir}/configure ./config.status --recheck -${srcdir}/configure: configure.in +${srcdir}/configure: $(MAINT) cd ${srcdir} && autoconf +$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in + @true +$(srcdir)/src/stamp-h.in: $(MAINT) + cd ${srcdir} && autoheader + rm -f $(srcdir)/src/stamp-h.in + echo timestamp > $(srcdir)/src/stamp-h.in + src/Makefile: $(srcdir)/src/Makefile.in config.status ./config.status @@ -289,6 +313,12 @@ lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status man/Makefile: $(srcdir)/man/Makefile.in config.status ./config.status +lispref/Makefile: $(srcdir)/lispref/Makefile.in config.status + ./config.status + +lispintro/Makefile: $(srcdir)/lispintro/Makefile.in config.status + ./config.status + oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status ./config.status @@ -328,16 +358,22 @@ install-arch-dep: mkdir exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ INSTALL_STRIP=${INSTALL_STRIP}) - ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version} - -chmod 1755 ${bindir}/emacs-${version} + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/$(EMACSFULL) + -chmod 1755 ${bindir}/$(EMACSFULL) rm -f ${bindir}/$(EMACS) - -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS) + -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS) -unset CDPATH; \ for f in `cd lib-src && echo fns-*.el`; do \ if test -r lib-src/$$f ; then \ ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \ else true; fi ; \ done + if test "${carbon_appdir}" != ""; then \ + umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \ + (cd mac/Emacs.app; tar -chf - . ) | \ + (cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \ + && cat > /dev/null) || exit 1; \ + fi ### Install the files that are machine-independent. ### Most of them come straight from the distribution; @@ -346,6 +382,9 @@ install-arch-dep: mkdir ## Note that we copy DOC* and then delete DOC ## as a workaround for a bug in tar on Ultrix 4.2. + +## If people complain about the h flag in tar command, take that out. +## That flag is also used in leim/Makefile.in install-arch-indep: mkdir info -set ${COPYDESTS} ; \ unset CDPATH; \ @@ -367,6 +406,7 @@ install-arch-indep: mkdir info (cd $${dir}; tar -chf - . ) \ | (cd $${dest}; umask 022; \ tar -xvf - && cat > /dev/null) || exit 1; \ + find $${dest} -exec chown $$LOGNAME {} ';' ;\ for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \ chmod a+rx $${subdir} ; \ rm -rf $${subdir}/RCS ; \ @@ -404,8 +444,9 @@ install-arch-indep: mkdir info then \ echo "Copying etc/DOC-* to ${docdir} ..." ; \ (cd ./etc; tar -chf - DOC*) \ - |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \ - (cd $(docdir); chmod a+r DOC*; rm DOC); \ + |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ + (cd $(docdir); chown $${LOGNAME} DOC*; chmod a+r DOC*; \ + if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ else true; fi -unset CDPATH; \ if [ -r ./lisp ] \ @@ -415,7 +456,8 @@ install-arch-indep: mkdir info then \ echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \ (cd lisp; tar -chf - *.el *.elc) \ - |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \ + |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ + (cd ${lispdir}; find . -exec chown $${LOGNAME} {} ';') ; \ else true; fi -unset CDPATH; \ thisdir=`/bin/pwd`; \ @@ -429,7 +471,7 @@ install-arch-indep: mkdir info chmod a+r ${infodir}/dir); \ fi; \ cd ${srcdir}/info ; \ - for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ + for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* tramp* vip* widget* woman*; do \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ chmod a+r ${infodir}/$$f); \ @@ -439,7 +481,7 @@ install-arch-indep: mkdir info thisdir=`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ then \ - for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \ + for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar tramp vip viper widget woman; do \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ done; \ @@ -447,7 +489,7 @@ install-arch-indep: mkdir info -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} thisdir=`/bin/pwd`; \ cd ${srcdir}/etc; \ - for page in emacs etags ctags gfdl ; do \ + for page in emacs emacsclient etags ctags ; do \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ chmod a+r ${man1dir}/$${page}${manext}); \ @@ -505,9 +547,9 @@ uninstall: done (cd ${archlibdir} && rm -f fns-*) -rm -rf ${libexecdir}/emacs/${version} - (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) - (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) - (cd ${bindir} && rm -f emacs-${version} $(EMACS)) + (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) + (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext}) + (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS)) FRC: @@ -527,6 +569,8 @@ mostlyclean: FRC (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) -(cd man && $(MAKE) $(MFLAGS) mostlyclean) + -(cd lispref && $(MAKE) $(MFLAGS) mostlyclean) + -(cd lispintro && $(MAKE) $(MFLAGS) mostlyclean) (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' @@ -543,6 +587,8 @@ clean: FRC (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) -(cd man && $(MAKE) $(MFLAGS) clean) + -(cd lispref && $(MAKE) $(MFLAGS) clean) + -(cd lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) ### `distclean' @@ -561,6 +607,8 @@ distclean: FRC (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) (cd man && $(MAKE) $(MFLAGS) distclean) + (cd lispref && $(MAKE) $(MFLAGS) distclean) + (cd lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) ${top_distclean} @@ -582,6 +630,8 @@ maintainer-clean: FRC (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) -(cd man && $(MAKE) $(MFLAGS) maintainer-clean) + -(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean) + -(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) ${top_distclean} @@ -605,7 +655,7 @@ extraclean: ### Note: it's no disaster if these productions miss a file or two; tar ### and VC will swiftly let you know if this happens, and it is easily ### corrected. -SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in \ +SOURCES = ChangeLog FTP INSTALL Makefile.in \ README configure make-dist move-if-change .PHONY: unlock relock @@ -618,6 +668,8 @@ unlock: (cd lisp; $(MAKE) $(MFLAGS) unlock) (cd lisp/term; chmod u+w README *.el) (cd man; chmod u+w *texi* ChangeLog split-man) + (cd lispref; chmod u+w *texi* ChangeLog) + (cd lispintro; chmod u+w *texi* ChangeLog) (cd oldXMenu; chmod u+w *.[ch] Makefile README) (cd lwlib; chmod u+w *.[ch] Makefile README) (cd src; $(MAKE) $(MFLAGS) unlock) @@ -630,6 +682,8 @@ relock: (cd lisp; $(MAKE) $(MFLAGS) relock) (cd lisp/term; chmod u+w README *.el) (cd man; chmod u+w *texi* ChangeLog split-man) + (cd lispref; chmod u+w *texi* ChangeLog) + (cd lispintro; chmod u+w *texi* ChangeLog) (cd oldXMenu; chmod u+w *.[ch] Makefile README) (cd lwlib; chmod u+w *.[ch] Makefile README) (cd src; $(MAKE) $(MFLAGS) relock) @@ -652,8 +706,12 @@ force-info: # so we can do ok running make in the build dir. info: force-info (cd man; $(MAKE) $(MFLAGS) info) + (cd lispref; $(MAKE) $(MFLAGS) info) + (cd lispintro; $(MAKE) $(MFLAGS) info) dvi: (cd man; $(MAKE) $(MFLAGS) dvi) + (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi) + (cd lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) #### Bootstrapping. @@ -662,18 +720,33 @@ dvi: ### special emacs executable is built from Lisp sources, which is then ### used to compile Lisp files. The last step is a "normal" make. -.PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean +.PHONY: bootstrap +.PHONY: maybe_bootstrap -bootstrap: clean bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean all info +maybe_bootstrap: + @bar="`echo $(srcdir)/lisp/*.elc`"; \ + if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \ + echo "Your tree does not include the compiled Lisp files."; \ + echo "You need to do \`make bootstrap' to build Emacs."; \ + echo "Emacs now requires Texinfo version 4.2."; \ + exit 1;\ + fi -bootstrap-lisp-1: +bootstrap: bootstrap-clean-before info FRC (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) - -bootstrap-lisp: - -(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs) - -bootstrap-src: (cd src; $(MAKE) $(MFLAGS) bootstrap) + (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs) + (cd src; $(MAKE) $(MFLAGS) mostlyclean) + $(MAKE) $(MFLAGS) all + +### Used for `bootstrap' to avoid deleting existing dumped Emacs executables. +bootstrap-clean-before: FRC + (cd src; $(MAKE) $(MFLAGS) mostlyclean) + (cd oldXMenu; $(MAKE) $(MFLAGS) clean) + (cd lwlib; $(MAKE) $(MFLAGS) clean) + (cd lib-src; $(MAKE) $(MFLAGS) clean) + -(cd man && $(MAKE) $(MFLAGS) clean) + -(cd lispref && $(MAKE) $(MFLAGS) clean) + -(cd lispintro && $(MAKE) $(MFLAGS) clean) + (cd leim; $(MAKE) $(MFLAGS) clean) -bootstrap-clean: - (cd src; $(MAKE) $(MFLAGS) clean)