# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,2004
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# with them.
#
# Delete `.dvi' files here if they are not part of the distribution.
-#
+#
# make distclean
# Delete all files from the current directory that are created by
# configuring or building the program. If you have unpacked the
# source and built the program without creating any other files,
# `make distclean' should leave only the files that were in the
# distribution.
-#
+#
# make maintainer-clean
# Delete everything from the current directory that can be
# reconstructed with this Makefile. This typically includes
-# everything deleted by distclean, plus more: C source files
-# produced by Bison, tags tables, info files, and so on.
+# everything deleted by distclean, plus more: .elc files,
+# C source files produced by Bison, tags tables, info files,
+# and so on.
#
# make extraclean
# Still more severe - delete backup and autosave files, too.
+#
+# make bootstrap
+# Recompiles all the Emacs Lisp files using the latest source,
+# then rebuilds Emacs.
+#
+# make bootfast
+# Recompiles changed Emacs Lisp files using the latest C source,
+# then rebuilds Emacs. This is faster than `make bootstrap'
+# but once in a while an old .elc file can cause trouble.
SHELL = /bin/sh
+# This may not work with certain non-GNU make's. It only matters when
+# inheriting a CDPATH not starting with the current directory.
+CDPATH=
+
# If Make doesn't predefine MAKE, set it here.
@SET_MAKE@
CPPFLAGS=@CPPFLAGS@
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
-YACC=@YACC@
+EXEEXT=@EXEEXT@
### These help us choose version- and architecture-specific directories
### to install files in.
# 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@
# 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
# building. This is only used during the process of
# compiling Emacs, to help Emacs find its lisp files
# before they've been installed in their final location.
-# It's usually identical to lisppath, except that
+# It's usually identical to lisppath, except that
# it does not include locallisppath, and the
# entry for the directory containing the installed lisp
# files has been replaced with ../lisp. This should be a
# 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 =
TRANSFORM = @program_transform_name@
# What emacs should be called when installed.
-EMACS = `echo emacs | sed '$(TRANSFORM)'`
-EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`
+EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'`
+EMACSFULL = `echo emacs-${version}${EXEEXT} | 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
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
COPYDESTS = ${etcdir} ${lispdir}
-all: maybe_bootstrap ${SUBDIR} leim
+all: ${SUBDIR} leim
removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@(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}'";' \
-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_DOC\).*$$;\1 "${docdir}";') && \
+ -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
+ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
+ -e 's;/[*] *arch-tag:.*;/*;') && \
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
# For parallel make, src should be build before leim.
.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}'
config.status: ${srcdir}/configure
./config.status --recheck
-${srcdir}/configure: configure.in
+${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
cd ${srcdir} && autoconf
+$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
+ @true
+$(srcdir)/src/stamp-h.in: @MAINT@ ${srcdir}/configure.in
+ 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
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/$(EMACSFULL)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} ${bindir}/$(EMACSFULL)
-chmod 1755 ${bindir}/$(EMACSFULL)
rm -f ${bindir}/$(EMACS)
-ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
${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;
## 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; \
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
+ find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\
for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
chmod a+rx $${subdir} ; \
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
rm -f $${subdir}/.cvsignore ; \
+ rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
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:-$$USERNAME} DOC*; chmod a+r DOC*; \
+ if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
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:-$$USERNAME} {} ';') ; \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
chmod a+r ${infodir}/dir); \
fi; \
cd ${srcdir}/info ; \
- 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* vip* widget* woman*; do \
+ for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* emacs-mime* emacs-xtra* eshell* eudc* flymake* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail*; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \
thisdir=`/bin/pwd`; \
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \
- 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 vip viper widget woman; do \
+ for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave info message mh-e pcl-cvs pgg reftex sc ses sieve speedbar tramp vip viper widget woman smtpmail; do \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
done; \
done
(cd ${archlibdir} && rm -f fns-*)
-rm -rf ${libexecdir}/emacs/${version}
- (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+ (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* emacs-xtra* flymake* forms* gnus* info* mh-e* sc* ses* vip* smtpmail*)
(cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
(cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
### record the configuration. Also preserve files that could be made
### by building, but normally aren't because the distribution comes
### with them.
-###
+###
### Delete `.dvi' files here if they are not part of the distribution.
clean: FRC
(cd src; $(MAKE) $(MFLAGS) clean)
### reconstructed with this Makefile. This typically includes
### everything deleted by distclean, plus more: C source files
### produced by Bison, tags tables, info files, and so on.
-###
+###
### One exception, however: `make maintainer-clean' should not delete
### `configure' even if `configure' can be remade using a rule in the
### Makefile. More generally, `make maintainer-clean' should not delete
-(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
${top_distclean}
### This doesn't actually appear in the coding standards, but Karl
### 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: bootstrap-build
+.PHONY: bootfast
.PHONY: maybe_bootstrap
maybe_bootstrap:
- if [ ! -f $(srcdir)/lisp/abbrev.elc ]; then \
- $(MAKE) $(MFLAGS) 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: boostrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean all info
-
-bootstrap-lisp-1:
- (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+bootstrap: bootstrap-clean-before info bootstrap-build FRC
-bootstrap-lisp:
- (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
+bootfast: bootstrap-clean-before-fast info bootstrap-build FRC
-bootstrap-src:
+bootstrap-build: FRC
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
+ (cd src; $(MAKE) $(MFLAGS) mostlyclean)
+ $(MAKE) $(MFLAGS) all
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
-bootstrap-clean-before: FRC
+bootstrap-clean-before: bootstrap-clean-before-fast FRC
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+
+### Used for `bootfast' to avoid deleting existing dumped Emacs executables
+### and compiled .elc files.
+bootstrap-clean-before-fast: FRC
(cd src; $(MAKE) $(MFLAGS) mostlyclean)
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)
-(cd lispref && $(MAKE) $(MFLAGS) clean)
-(cd lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
-
-bootstrap-clean-after:
- (cd src; $(MAKE) $(MFLAGS) mostlyclean)