X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7e5e0277f0309b52a042c9a4f73c2e1374b1fa6f..07478155f2492e36b0f9c7bd162084e290e21634:/Makefile.in diff --git a/Makefile.in b/Makefile.in index e2d90b8980..c459018853 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,6 +44,8 @@ C_SWITCH_SYSTEM=@c_switch_system@ ALLOCA=@ALLOCA@ LN_S=@LN_S@ CFLAGS=@CFLAGS@ +LDFLAGS=@LDFLAGS@ +CPPFLAGS=@CPPFLAGS@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@ YACC=@YACC@ @@ -79,9 +81,8 @@ bindir=@bindir@ datadir=@datadir@ # Where to install and expect the files that Emacs modifies as it -# runs. These files are all architecture-independent. Right now, the -# only such data is the locking directory; ${lockdir} is a -# subdirectory of this. +# runs. These files are all architecture-independent. +# Right now, this is not used. sharedstatedir=@sharedstatedir@ # Where to install and expect executable files to be run by Emacs @@ -92,6 +93,7 @@ libexecdir=@libexecdir@ # Where to install Emacs's man pages, and what extension they should have. mandir=@mandir@ manext=.1 +man1dir=$(mandir)/man1 # Where to install and expect the info files describing Emacs. In the # past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but @@ -111,6 +113,9 @@ srcdir=@srcdir@ # Tell make where to find source files; this is needed for the makefiles. VPATH=@srcdir@ +# Where to find the application default. +x_default_search_path=@x_default_search_path@ + # ==================== Emacs-specific directories ==================== # These variables hold the values Emacs will actually use. They are @@ -153,11 +158,6 @@ buildlisppath=${srcdir}/lisp # at once. etcdir=@etcdir@ -# Where to create and expect the locking directory, where -# the Emacs locking code keeps track of which files are -# currently being edited. -lockdir=@lockdir@ - # Where to put executables to be run by Emacs rather than # the user. This path usually includes the Emacs version # and configuration name, so that multiple configurations @@ -174,6 +174,8 @@ docdir=@docdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +# By default, we uphold the dignity of our programs. +INSTALL_STRIP = # ============================= Targets ============================== @@ -183,71 +185,46 @@ 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 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. COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = ${etcdir} ${lispdir} -all: paths-force ${SUBDIR} +all: ${SUBDIR} removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' -# Note that sed is not in /bin on 386bsd. -src/paths.h: Makefile ${srcdir}/src/paths.h.in - @echo "Producing \`src/paths.h' from \`src/paths.h.in'." +# Generate paths.h from paths.in. This target is invoked by `configure'. +paths-force: FRC @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ - sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ + x_default_search_path=`echo ${x_default_search_path}`; \ + sed < ${srcdir}/src/paths.in > paths.h.$$$$ \ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ - -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') && \ - ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h - -# For `make all', -# we force the rebuilding of src/paths.h because the user might give -# make different values for the various directories. Since we use -# move-if-change, src/paths.h only actually changes if the user did -# something notable, so the only unnecessary work we do is in building -# paths.h.tmp$$$$, which isn't much. -# Note that sed is not in /bin on 386bsd. -# We depend on src/paths.h here to prevent simultaneous execution of -# that rule and this one, in a parallel make. -# It is possible for paths.h to be updated twice--but that would happen anyway. -paths-force: FRC src/paths.h - @echo "Producing \`src/paths.h' from \`src/paths.h.in'." - @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ - buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ - sed < ${srcdir}/src/paths.h.in > paths.h.tmp$$$$ \ - -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ - -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ - -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ - -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ - -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ - -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ - -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') && \ - ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h + -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ + -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ + ${srcdir}/move-if-change paths.h.$$$$ src/paths.h -src: lib-src FRC src/paths.h +# For parallel make, src should be build before leim. +leim: src -# This ought to depend on src/paths.h, so that in parallel make -# src/paths.h will be available for the compilations in lib-src. -# But that causes trouble in `make install' if a different prefix -# is specified at that time. -lib-src: FRC src/paths.h +src: lib-src FRC + +lib-src: FRC src/config.stamp .RECURSIVE: ${SUBDIR} @@ -263,18 +240,28 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC Makefile: Makefile.in config.status ./config.status -src/Makefile: src/Makefile.in.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 +man/Makefile: man/Makefile.in config.status + ./config.status + oldXMenu/Makefile: oldXMenu/Makefile.in config.status ./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 @@ -291,82 +278,125 @@ lwlib/Makefile: lwlib/Makefile.in config.status ## place with their files read-only (perhaps because they are checked ## into RCS). In order to make this safe, we make sure that the ## 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} 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. +### 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 install-leim blessmail + @true + +### Install the executables that were compiled specifically for this machine. +### It would be nice to do something for a parallel make +### to ensure that install-arch-indep finishes before this starts. install-arch-dep: mkdir (cd lib-src; \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} \ - libexecdir=${libexecdir} archlibdir=${archlibdir}) - ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version} + libexecdir=${libexecdir} archlibdir=${archlibdir} \ + INSTALL_STRIP=${INSTALL_STRIP}) + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version} -chmod 1755 ${bindir}/emacs-${version} 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. +### 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. +## 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 \ - if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ - rm -rf $$1 ; \ - fi ; \ - shift ; \ - done + for dir in ${COPYDIR} ; do \ + if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ + rm -rf $$1 ; \ + fi ; \ + shift ; \ + done -set ${COPYDESTS} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ - for dir in ${COPYDIR} ; do \ - dest=$$1 ; shift ; \ - [ -d $${dir} ] \ - && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ - && (echo "Copying $${dir}..." ; \ - (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \ - for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ - rm -rf $${subdir}/RCS ; \ - rm -rf $${subdir}/CVS ; \ - rm -f $${subdir}/\#* ; \ - rm -f $${subdir}/.\#* ; \ - rm -f $${subdir}/*~ ; \ - rm -f $${subdir}/*.orig ; \ - done) ; \ - done + mkdir ${COPYDESTS} ; \ + chmod ugo+rx ${COPYDESTS} ; \ + for dir in ${COPYDIR} ; do \ + dest=$$1 ; shift ; \ + [ -d $${dir} ] \ + && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ + && (echo "Copying $${dir} to $${dest}..." ; \ + (cd $${dir}; tar -cf - . ) \ + |(cd $${dest};umask 022; tar -xvf - && cat > /dev/null); \ + for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ + rm -rf $${subdir}/RCS ; \ + rm -rf $${subdir}/CVS ; \ + rm -f $${subdir}/\#* ; \ + rm -f $${subdir}/.\#* ; \ + rm -f $${subdir}/*~ ; \ + rm -f $${subdir}/*.orig ; \ + rm -f $${subdir}/[mM]akefile* ; \ + rm -f $${subdir}/ChangeLog* ; \ + rm -f $${subdir}/dired.todo ; \ + done) ; \ + done -rm -f ${lispdir}/subdirs.el $(srcdir)/update-subdirs ${lispdir} + -chmod -R a+r ${COPYDESTS} if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ then \ - echo "Copying etc/DOC-* ..." ; \ - (cd etc; tar -cf - DOC-*)|(cd ${docdir}; umask 0; tar -xvf - ); \ + echo "Copying etc/DOC-* to ${docdir} ..." ; \ + (cd ./etc; tar -cf - DOC*) \ + |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \ + (cd $(docdir); chmod a+r DOC*; rm DOC) \ + else true; fi + if [ -r ./lisp ] \ + && [ -r ./lisp/simple.el ] \ + && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \ + && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \ + then \ + echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \ + (cd lisp; tar -cf - *.el *.elc) \ + |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \ else true; fi thisdir=`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ then \ - (cd ${srcdir}/info ; \ - if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ - fi ; \ - for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ + (cd ${infodir}; \ + if [ -f dir ]; then \ + if [ ! -f dir.old ]; then mv -f dir dir.old; \ + else mv -f dir dir.bak; fi; \ + fi; \ + cd ${srcdir}/info ; \ + (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ + (cd $${thisdir}; chmod a+r ${infodir}/dir); \ + for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* widget*; do \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ + chmod a+r ${infodir}/$$f); \ done); \ else true; fi - thisdir=`/bin/pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \ + thisdir=`/bin/pwd`; \ + cd ${srcdir}/etc; \ + for page in emacs etags ctags ; do \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ + 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 mkdir + cd leim; $(MAKE) install + +### Build Emacs and install it, stripping binaries while installing them. +install-strip: + $(MAKE) INSTALL_STRIP=-s + ### Build all the directories we're going to install Emacs in. Since ### we may be creating several layers of directories (for example, ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs ### instead of mkdir. Not all systems' mkdir programs have the `-p' flag. mkdir: FRC - $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \ + $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \ ${bindir} ${datadir} ${docdir} ${libexecdir} \ `echo ${locallisppath} | sed 's/:/ /g'` - -chmod 777 ${lockdir} ### Delete all the installed files that the `install' target would ### create (but not the noninstalled files such as `make all' would @@ -391,8 +421,8 @@ uninstall: esac ; \ fi ; \ done - (cd ${infodir} && rm -f cl* emacs* forms* info* vip*) - (cd ${mandir} && rm -f emacs.1 etags.1 ctags.1) + (cd ${infodir} && rm -f cl* 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)) @@ -413,6 +443,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 @@ -428,6 +459,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 @@ -436,17 +468,17 @@ clean: FRC ### `make distclean' should leave only the files that were in the ### distribution. top_distclean=\ - rm -f config.status config.cache ; \ + rm -f config.status config.cache config.log ; \ rm -f Makefile ${SUBDIR_MAKEFILES} ; \ - (cd lock && rm -f *) + (cd lock && (rm -f * || true)) distclean: FRC (cd src; $(MAKE) $(MFLAGS) distclean) (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) (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' ### Delete everything from the current directory that can be @@ -465,6 +497,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 @@ -473,8 +506,8 @@ maintainer-clean: FRC ### it deletes backup and autosave files too. extraclean: for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done - -(cd lock && rm *) - -rm config.status config-tmp-* + ${top_distclean} + -rm config-tmp-* -rm -f *~ \#* ### Unlocking and relocking. The idea of these productions is to reduce @@ -516,14 +549,15 @@ relock: (cd lwlib; chmod u+w *.[ch] Makefile README) (cd src; $(MAKE) $(MFLAGS) relock) -TAGS tags: lib-src - cd ${srcdir}/src; $(MAKE) tags +TAGS tags: lib-src src + # The src subdir knows how to do the right thing + # even when the build directory and source dir are different. + cd src; $(MAKE) tags 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