aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-04-16 19:05:48 -0700
committerPaul Eggert2014-04-16 19:05:48 -0700
commit2ff06dac09ff973734c74c15540c15529cb2413b (patch)
tree693e10ffb23f343d8be882c390e9b06808623852
parenteb36672f2bc4cb3eeed3bd802c340ccb8416ad26 (diff)
downloademacs-2ff06dac09ff973734c74c15540c15529cb2413b.tar.gz
emacs-2ff06dac09ff973734c74c15540c15529cb2413b.zip
* 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.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in26
2 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index d43d82def57..a419cba153b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-04-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 * Makefile.in (FRC): Remove.
4 All uses removed. This hack is no longer needed here
5 now that we can assume GNU Make's .PHONY feature works.
6
12014-04-16 Eli Zaretskii <eliz@gnu.org> 72014-04-16 Eli Zaretskii <eliz@gnu.org>
2 8
3 * config.bat: Update for Emacs 24.4. 9 * config.bat: Update for Emacs 24.4.
diff --git a/Makefile.in b/Makefile.in
index b2887472dd4..201d7b8bb56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,7 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
290 290
291all: ${SUBDIR} info 291all: ${SUBDIR} info
292 292
293.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC 293.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32
294 294
295removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' 295removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
296 296
@@ -298,7 +298,7 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
298# See comments in configure.ac for why it is done this way, as opposed 298# See comments in configure.ac for why it is done this way, as opposed
299# to just letting configure generate epaths.h from epaths.in in a 299# to just letting configure generate epaths.h from epaths.in in a
300# similar way to how Makefile is made from Makefile.in. 300# similar way to how Makefile is made from Makefile.in.
301epaths-force: FRC 301epaths-force:
302 @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \ 302 @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
303 locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \ 303 locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
304 buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \ 304 buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
@@ -335,7 +335,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
335# MS-Windows format (e.g. 'c:/foo/bar'), because temacs is a MinGW 335# MS-Windows format (e.g. 'c:/foo/bar'), because temacs is a MinGW
336# program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or 336# program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or
337# '/foo/bar'). 337# '/foo/bar').
338epaths-force-w32: FRC 338epaths-force-w32:
339 @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ 339 @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
340 w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \ 340 w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
341 w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \ 341 w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
@@ -359,7 +359,7 @@ src: lib-src
359lisp: src 359lisp: src
360 360
361# These targets should be "${SUBDIR} without `src'". 361# These targets should be "${SUBDIR} without `src'".
362lib lib-src lisp nt: Makefile FRC 362lib lib-src lisp nt: Makefile
363 cd $@ && $(MAKE) all $(MFLAGS) \ 363 cd $@ && $(MAKE) all $(MFLAGS) \
364 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ 364 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
365 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' 365 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@@ -378,7 +378,7 @@ lib lib-src lisp nt: Makefile FRC
378# This passes an unexpanded $srcdir to src's Makefile, which then 378# This passes an unexpanded $srcdir to src's Makefile, which then
379# expands it using its own value of srcdir (which points to the 379# expands it using its own value of srcdir (which points to the
380# source directory of src/). 380# source directory of src/).
381src: Makefile FRC 381src: Makefile
382 dirstate='.bzr/checkout/dirstate'; \ 382 dirstate='.bzr/checkout/dirstate'; \
383 vcswitness='$$(srcdir)/../'$$dirstate; \ 383 vcswitness='$$(srcdir)/../'$$dirstate; \
384 [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ 384 [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \
@@ -390,7 +390,7 @@ src: Makefile FRC
390 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ 390 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
391 VCSWITNESS="$$vcswitness" 391 VCSWITNESS="$$vcswitness"
392 392
393blessmail: Makefile src FRC 393blessmail: Makefile src
394 cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ 394 cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
395 MAKE='${MAKE}' archlibdir='$(archlibdir)' 395 MAKE='${MAKE}' archlibdir='$(archlibdir)'
396 396
@@ -791,8 +791,6 @@ uninstall-nt:
791 bindir="${bindir}" libexecdir="${libexecdir}" \ 791 bindir="${bindir}" libexecdir="${libexecdir}" \
792 archlibdir="${archlibdir}" 792 archlibdir="${archlibdir}"
793 793
794FRC:
795
796# ==================== Cleaning up and miscellanea ==================== 794# ==================== Cleaning up and miscellanea ====================
797 795
798.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean 796.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean
@@ -802,7 +800,7 @@ FRC:
802### normally don't want to recompile. For example, the `mostlyclean' 800### normally don't want to recompile. For example, the `mostlyclean'
803### target for GCC does not delete `libgcc.a', because recompiling it 801### target for GCC does not delete `libgcc.a', because recompiling it
804### is rarely necessary and takes a lot of time. 802### is rarely necessary and takes a lot of time.
805mostlyclean: FRC 803mostlyclean:
806 cd src && $(MAKE) $(MFLAGS) mostlyclean 804 cd src && $(MAKE) $(MFLAGS) mostlyclean
807 cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean 805 cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
808 cd lwlib && $(MAKE) $(MFLAGS) mostlyclean 806 cd lwlib && $(MAKE) $(MFLAGS) mostlyclean
@@ -822,7 +820,7 @@ mostlyclean: FRC
822### with them. 820### with them.
823### 821###
824### Delete `.dvi' files here if they are not part of the distribution. 822### Delete `.dvi' files here if they are not part of the distribution.
825clean: FRC 823clean:
826 -rm -f etc/emacs.tmpdesktop 824 -rm -f etc/emacs.tmpdesktop
827 cd src && $(MAKE) $(MFLAGS) clean 825 cd src && $(MAKE) $(MFLAGS) clean
828 cd oldXMenu && $(MAKE) $(MFLAGS) clean 826 cd oldXMenu && $(MAKE) $(MFLAGS) clean
@@ -849,7 +847,7 @@ top_bootclean=\
849top_distclean=\ 847top_distclean=\
850 ${top_bootclean}; \ 848 ${top_bootclean}; \
851 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES} 849 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
852distclean: FRC 850distclean:
853 cd src && $(MAKE) $(MFLAGS) distclean 851 cd src && $(MAKE) $(MFLAGS) distclean
854 cd oldXMenu && $(MAKE) $(MFLAGS) distclean 852 cd oldXMenu && $(MAKE) $(MFLAGS) distclean
855 cd lwlib && $(MAKE) $(MFLAGS) distclean 853 cd lwlib && $(MAKE) $(MFLAGS) distclean
@@ -871,7 +869,7 @@ distclean: FRC
871### `bootstrap-clean' 869### `bootstrap-clean'
872### Delete everything that can be reconstructed by `make' and that 870### Delete everything that can be reconstructed by `make' and that
873### needs to be deleted in order to force a bootstrap from a clean state. 871### needs to be deleted in order to force a bootstrap from a clean state.
874bootstrap-clean: FRC 872bootstrap-clean:
875 cd src && $(MAKE) $(MFLAGS) bootstrap-clean 873 cd src && $(MAKE) $(MFLAGS) bootstrap-clean
876 cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean 874 cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
877 cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean 875 cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean
@@ -906,7 +904,7 @@ bootstrap-clean: FRC
906top_maintainer_clean=\ 904top_maintainer_clean=\
907 ${top_distclean}; \ 905 ${top_distclean}; \
908 rm -fr autom4te.cache 906 rm -fr autom4te.cache
909maintainer-clean: bootstrap-clean FRC 907maintainer-clean: bootstrap-clean
910 cd src && $(MAKE) $(MFLAGS) maintainer-clean 908 cd src && $(MAKE) $(MFLAGS) maintainer-clean
911 cd leim && $(MAKE) $(MFLAGS) maintainer-clean 909 cd leim && $(MAKE) $(MFLAGS) maintainer-clean
912 cd lisp && $(MAKE) $(MFLAGS) maintainer-clean 910 cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
@@ -1088,7 +1086,7 @@ check-info: info
1088# * Run autogen.sh. 1086# * Run autogen.sh.
1089# * Rebuild Makefile, to update the build procedure itself. 1087# * Rebuild Makefile, to update the build procedure itself.
1090# * Do the actual build. 1088# * Do the actual build.
1091bootstrap: bootstrap-clean FRC 1089bootstrap: bootstrap-clean
1092 cd $(srcdir) && ./autogen.sh 1090 cd $(srcdir) && ./autogen.sh
1093 $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile 1091 $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
1094 $(MAKE) $(MFLAGS) info all 1092 $(MAKE) $(MFLAGS) info all