emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116985: * Makefile.in (FRC): Remove.


From: Paul Eggert
Subject: [Emacs-diffs] trunk r116985: * Makefile.in (FRC): Remove.
Date: Thu, 17 Apr 2014 02:05:51 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116985
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-16 19:05:48 -0700
message:
  * 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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-16 19:43:46 +0000
+++ b/ChangeLog 2014-04-17 02:05:48 +0000
@@ -1,3 +1,9 @@
+2014-04-17  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * config.bat: Update for Emacs 24.4.

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-03-27 19:41:57 +0000
+++ b/Makefile.in       2014-04-17 02:05:48 +0000
@@ -290,7 +290,7 @@
 
 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'
 
@@ -298,7 +298,7 @@
 # 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
 # similar way to how Makefile is made from Makefile.in.
-epaths-force: FRC
+epaths-force:
        @(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
          locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
          buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
@@ -335,7 +335,7 @@
 # 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
 # '/foo/bar').
-epaths-force-w32: FRC
+epaths-force-w32:
        @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
          w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
          w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
@@ -359,7 +359,7 @@
 lisp: 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)                         \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@@ -378,7 +378,7 @@
 # This passes an unexpanded $srcdir to src's Makefile, which then
 # expands it using its own value of srcdir (which points to the
 # source directory of src/).
-src: Makefile FRC
+src: Makefile
        dirstate='.bzr/checkout/dirstate';                              \
        vcswitness='$$(srcdir)/../'$$dirstate;                          \
        [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
@@ -390,7 +390,7 @@
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"   \
          VCSWITNESS="$$vcswitness"
 
-blessmail: Makefile src FRC
+blessmail: Makefile src
        cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
          MAKE='${MAKE}' archlibdir='$(archlibdir)'
 
@@ -791,8 +791,6 @@
            bindir="${bindir}" libexecdir="${libexecdir}" \
            archlibdir="${archlibdir}"
 
-FRC:
-
 # ==================== Cleaning up and miscellanea ====================
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean
@@ -802,7 +800,7 @@
 ###      normally don't want to recompile.  For example, the `mostlyclean'
 ###      target for GCC does not delete `libgcc.a', because recompiling it
 ###      is rarely necessary and takes a lot of time.
-mostlyclean: FRC
+mostlyclean:
        cd src      && $(MAKE) $(MFLAGS) mostlyclean
        cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
        cd lwlib    && $(MAKE) $(MFLAGS) mostlyclean
@@ -822,7 +820,7 @@
 ###      with them.
 ###
 ###      Delete `.dvi' files here if they are not part of the distribution.
-clean: FRC
+clean:
        -rm -f etc/emacs.tmpdesktop
        cd src      && $(MAKE) $(MFLAGS) clean
        cd oldXMenu && $(MAKE) $(MFLAGS) clean
@@ -849,7 +847,7 @@
 top_distclean=\
        ${top_bootclean}; \
        rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
-distclean: FRC
+distclean:
        cd src      && $(MAKE) $(MFLAGS) distclean
        cd oldXMenu && $(MAKE) $(MFLAGS) distclean
        cd lwlib    && $(MAKE) $(MFLAGS) distclean
@@ -871,7 +869,7 @@
 ### `bootstrap-clean'
 ###      Delete everything that can be reconstructed by `make' and that
 ###      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 oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
        cd lwlib    && $(MAKE) $(MFLAGS) maintainer-clean
@@ -906,7 +904,7 @@
 top_maintainer_clean=\
        ${top_distclean}; \
        rm -fr autom4te.cache
-maintainer-clean: bootstrap-clean FRC
+maintainer-clean: bootstrap-clean
        cd src  && $(MAKE) $(MFLAGS) maintainer-clean
        cd leim && $(MAKE) $(MFLAGS) maintainer-clean
        cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
@@ -1088,7 +1086,7 @@
 #  * Run autogen.sh.
 #  * Rebuild Makefile, to update the build procedure itself.
 #  * Do the actual build.
-bootstrap: bootstrap-clean FRC
+bootstrap: bootstrap-clean
        cd $(srcdir) && ./autogen.sh
        $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
        $(MAKE) $(MFLAGS) info all


reply via email to

[Prev in Thread] Current Thread [Next in Thread]