HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Ulf Jasper <ulf.jasper@web.de>:
[bpt/emacs.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
32168df
..
9753017
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-2,8
+2,8
@@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# 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, 2002
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.
# This file is part of GNU Emacs.
@@
-34,25
+34,39
@@
# with them.
#
# Delete `.dvi' files here if they are not part of the distribution.
# 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 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
# 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 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
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@
# If Make doesn't predefine MAKE, set it here.
@SET_MAKE@
@@
-68,7
+82,7
@@
LDFLAGS=@LDFLAGS@
CPPFLAGS=@CPPFLAGS@
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
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.
### These help us choose version- and architecture-specific directories
### to install files in.
@@
-171,7
+185,7
@@
lisppath=@lisppath@
# 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.
# 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
# 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
@@
-215,8
+229,8
@@
INSTALL_STRIP =
TRANSFORM = @program_transform_name@
# What emacs should be called when installed.
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 = `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.
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution.
@@
-235,9
+249,6
@@
SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
COPYDESTS = ${etcdir} ${lispdir}
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'
all: ${SUBDIR} leim
removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@@
-257,7
+268,8
@@
epaths-force: FRC
-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_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}";') && \
+ -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.
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
# For parallel make, src should be build before leim.
@@
-290,12
+302,12
@@
Makefile: $(srcdir)/Makefile.in config.status
config.status: ${srcdir}/configure
./config.status --recheck
config.status: ${srcdir}/configure
./config.status --recheck
-${srcdir}/configure:
$(MAINT)
+${srcdir}/configure:
@MAINT@ ${srcdir}/configure.in
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
-$(srcdir)/src/stamp-h.in:
$(MAINT)
+$(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
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
@@
-358,7
+370,7
@@
install-arch-dep: mkdir
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs
@EXEEXT@
${bindir}/$(EMACSFULL)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs
${EXEEXT}
${bindir}/$(EMACSFULL)
-chmod 1755 ${bindir}/$(EMACSFULL)
rm -f ${bindir}/$(EMACS)
-ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
-chmod 1755 ${bindir}/$(EMACSFULL)
rm -f ${bindir}/$(EMACS)
-ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
@@
-370,9
+382,9
@@
install-arch-dep: mkdir
done
if test "${carbon_appdir}" != ""; then \
umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
done
if test "${carbon_appdir}" != ""; then \
umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
- (cd mac/Emacs.app;
tar -chf - . )
| \
+ (cd mac/Emacs.app;
(tar -chf - .
| \
(cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
(cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
- && cat > /dev/null) || exit 1; \
+ && cat > /dev/null)
))
|| exit 1; \
fi
### Install the files that are machine-independent.
fi
### Install the files that are machine-independent.
@@
-412,6
+424,7
@@
install-arch-indep: mkdir info
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
rm -f $${subdir}/.cvsignore ; \
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}/*~ ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
@@
-471,7
+484,7
@@
install-arch-indep: mkdir info
chmod a+r ${infodir}/dir); \
fi; \
cd ${srcdir}/info ; \
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* e
shell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* tramp* vip* widget* woman
*; do \
+ for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* e
macs-mime* emacs-xtra* eshell* eudc* flymake* forms* gnus* idlwave* info* message* mh-e* org* pcl-cvs* pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail* url
*; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \
@@
-481,7
+494,7
@@
install-arch-indep: mkdir info
thisdir=`/bin/pwd`; \
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \
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 e
shell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar tramp vip viper widget woman
; do \
+ for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime e
macs-xtra eshell eudc flymake forms gnus idlwave info message mh-e org pcl-cvs pgg reftex sc ses sieve speedbar tramp vip viper widget woman smtpmail url
; do \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
done; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
done; \
@@
-547,7
+560,7
@@
uninstall:
done
(cd ${archlibdir} && rm -f fns-*)
-rm -rf ${libexecdir}/emacs/${version}
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* tramp* 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* org* sc* ses* vip* smtpmail* url
*)
(cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
(cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
(cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
(cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
@@
-579,7
+592,7
@@
mostlyclean: FRC
### record the configuration. Also preserve files that could be made
### by building, but normally aren't because the distribution comes
### with them.
### 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)
### Delete `.dvi' files here if they are not part of the distribution.
clean: FRC
(cd src; $(MAKE) $(MFLAGS) clean)
@@
-618,7
+631,7
@@
distclean: FRC
### 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.
### 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
### 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
@@
-633,6
+646,7
@@
maintainer-clean: FRC
-(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
-(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
${top_distclean}
### This doesn't actually appear in the coding standards, but Karl
@@
-721,6
+735,8
@@
dvi:
### used to compile Lisp files. The last step is a "normal" make.
.PHONY: bootstrap
### used to compile Lisp files. The last step is a "normal" make.
.PHONY: bootstrap
+.PHONY: bootstrap-build
+.PHONY: bootfast
.PHONY: maybe_bootstrap
maybe_bootstrap:
.PHONY: maybe_bootstrap
maybe_bootstrap:
@@
-732,16
+748,25
@@
maybe_bootstrap:
exit 1;\
fi
exit 1;\
fi
-bootstrap: bootstrap-clean-before info FRC
- (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+bootstrap: bootstrap-clean-before info bootstrap-build FRC
+
+bootfast: bootstrap-clean-before-fast info bootstrap-build FRC
+
+bootstrap-build: FRC
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
- (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs
@EXEEXT@
)
+ (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.
(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 src; $(MAKE) $(MFLAGS) mostlyclean)
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)
@@
-750,4
+775,3
@@
bootstrap-clean-before: FRC
-(cd lispref && $(MAKE) $(MFLAGS) clean)
-(cd lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
-(cd lispref && $(MAKE) $(MFLAGS) clean)
-(cd lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
-