Commit 2ff06dac authored by Paul Eggert's avatar Paul Eggert

* Makefile.in (FRC): Remove.

All uses removed.  This hack is no longer needed here
now that we can assume GNU Make's .PHONY feature works.
parent eb36672f
2014-04-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (FRC): Remove.
All uses removed. This hack is no longer needed here
now that we can assume GNU Make's .PHONY feature works.
2014-04-16 Eli Zaretskii <eliz@gnu.org> 2014-04-16 Eli Zaretskii <eliz@gnu.org>
* config.bat: Update for Emacs 24.4. * config.bat: Update for Emacs 24.4.
......
...@@ -290,7 +290,7 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" ...@@ -290,7 +290,7 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
all: ${SUBDIR} info all: ${SUBDIR} info
.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32
removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
...@@ -298,7 +298,7 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' ...@@ -298,7 +298,7 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
# See comments in configure.ac for why it is done this way, as opposed # See comments in configure.ac for why it is done this way, as opposed
# to just letting configure generate epaths.h from epaths.in in a # to just letting configure generate epaths.h from epaths.in in a
# similar way to how Makefile is made from Makefile.in. # similar way to how Makefile is made from Makefile.in.
epaths-force: FRC epaths-force:
@(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
...@@ -335,7 +335,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' ...@@ -335,7 +335,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
# MS-Windows format (e.g. 'c:/foo/bar'), because temacs is a MinGW # MS-Windows format (e.g. 'c:/foo/bar'), because temacs is a MinGW
# program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or # program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or
# '/foo/bar'). # '/foo/bar').
epaths-force-w32: FRC epaths-force-w32:
@(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \ w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \ w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
...@@ -359,7 +359,7 @@ src: lib-src ...@@ -359,7 +359,7 @@ src: lib-src
lisp: src lisp: src
# These targets should be "${SUBDIR} without `src'". # These targets should be "${SUBDIR} without `src'".
lib lib-src lisp nt: Makefile FRC lib lib-src lisp nt: Makefile
cd $@ && $(MAKE) all $(MFLAGS) \ cd $@ && $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
...@@ -378,7 +378,7 @@ lib lib-src lisp nt: Makefile FRC ...@@ -378,7 +378,7 @@ lib lib-src lisp nt: Makefile FRC
# This passes an unexpanded $srcdir to src's Makefile, which then # This passes an unexpanded $srcdir to src's Makefile, which then
# expands it using its own value of srcdir (which points to the # expands it using its own value of srcdir (which points to the
# source directory of src/). # source directory of src/).
src: Makefile FRC src: Makefile
dirstate='.bzr/checkout/dirstate'; \ dirstate='.bzr/checkout/dirstate'; \
vcswitness='$$(srcdir)/../'$$dirstate; \ vcswitness='$$(srcdir)/../'$$dirstate; \
[ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \
...@@ -390,7 +390,7 @@ src: Makefile FRC ...@@ -390,7 +390,7 @@ src: Makefile FRC
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
VCSWITNESS="$$vcswitness" VCSWITNESS="$$vcswitness"
blessmail: Makefile src FRC blessmail: Makefile src
cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
MAKE='${MAKE}' archlibdir='$(archlibdir)' MAKE='${MAKE}' archlibdir='$(archlibdir)'
...@@ -791,8 +791,6 @@ uninstall-nt: ...@@ -791,8 +791,6 @@ uninstall-nt:
bindir="${bindir}" libexecdir="${libexecdir}" \ bindir="${bindir}" libexecdir="${libexecdir}" \
archlibdir="${archlibdir}" archlibdir="${archlibdir}"
FRC:
# ==================== Cleaning up and miscellanea ==================== # ==================== Cleaning up and miscellanea ====================
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean
...@@ -802,7 +800,7 @@ FRC: ...@@ -802,7 +800,7 @@ FRC:
### normally don't want to recompile. For example, the `mostlyclean' ### normally don't want to recompile. For example, the `mostlyclean'
### target for GCC does not delete `libgcc.a', because recompiling it ### target for GCC does not delete `libgcc.a', because recompiling it
### is rarely necessary and takes a lot of time. ### is rarely necessary and takes a lot of time.
mostlyclean: FRC mostlyclean:
cd src && $(MAKE) $(MFLAGS) mostlyclean cd src && $(MAKE) $(MFLAGS) mostlyclean
cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
cd lwlib && $(MAKE) $(MFLAGS) mostlyclean cd lwlib && $(MAKE) $(MFLAGS) mostlyclean
...@@ -822,7 +820,7 @@ mostlyclean: FRC ...@@ -822,7 +820,7 @@ mostlyclean: FRC
### with them. ### with them.
### ###
### Delete `.dvi' files here if they are not part of the distribution. ### Delete `.dvi' files here if they are not part of the distribution.
clean: FRC clean:
-rm -f etc/emacs.tmpdesktop -rm -f etc/emacs.tmpdesktop
cd src && $(MAKE) $(MFLAGS) clean cd src && $(MAKE) $(MFLAGS) clean
cd oldXMenu && $(MAKE) $(MFLAGS) clean cd oldXMenu && $(MAKE) $(MFLAGS) clean
...@@ -849,7 +847,7 @@ top_bootclean=\ ...@@ -849,7 +847,7 @@ top_bootclean=\
top_distclean=\ top_distclean=\
${top_bootclean}; \ ${top_bootclean}; \
rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES} rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
distclean: FRC distclean:
cd src && $(MAKE) $(MFLAGS) distclean cd src && $(MAKE) $(MFLAGS) distclean
cd oldXMenu && $(MAKE) $(MFLAGS) distclean cd oldXMenu && $(MAKE) $(MFLAGS) distclean
cd lwlib && $(MAKE) $(MFLAGS) distclean cd lwlib && $(MAKE) $(MFLAGS) distclean
...@@ -871,7 +869,7 @@ distclean: FRC ...@@ -871,7 +869,7 @@ distclean: FRC
### `bootstrap-clean' ### `bootstrap-clean'
### Delete everything that can be reconstructed by `make' and that ### Delete everything that can be reconstructed by `make' and that
### needs to be deleted in order to force a bootstrap from a clean state. ### needs to be deleted in order to force a bootstrap from a clean state.
bootstrap-clean: FRC bootstrap-clean:
cd src && $(MAKE) $(MFLAGS) bootstrap-clean cd src && $(MAKE) $(MFLAGS) bootstrap-clean
cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean
...@@ -906,7 +904,7 @@ bootstrap-clean: FRC ...@@ -906,7 +904,7 @@ bootstrap-clean: FRC
top_maintainer_clean=\ top_maintainer_clean=\
${top_distclean}; \ ${top_distclean}; \
rm -fr autom4te.cache rm -fr autom4te.cache
maintainer-clean: bootstrap-clean FRC maintainer-clean: bootstrap-clean
cd src && $(MAKE) $(MFLAGS) maintainer-clean cd src && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) maintainer-clean cd leim && $(MAKE) $(MFLAGS) maintainer-clean
cd lisp && $(MAKE) $(MFLAGS) maintainer-clean cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
...@@ -1088,7 +1086,7 @@ check-info: info ...@@ -1088,7 +1086,7 @@ check-info: info
# * Run autogen.sh. # * Run autogen.sh.
# * Rebuild Makefile, to update the build procedure itself. # * Rebuild Makefile, to update the build procedure itself.
# * Do the actual build. # * Do the actual build.
bootstrap: bootstrap-clean FRC bootstrap: bootstrap-clean
cd $(srcdir) && ./autogen.sh cd $(srcdir) && ./autogen.sh
$(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) $(MFLAGS) info all $(MAKE) $(MFLAGS) info all
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment