[Emacs-diffs] trunk r117437: Small cleanup for src/Makefile liblw.a, libXMenu11.a rules

[Glenn Morris]

------------------------------------------------------------
revno: 117437
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-28 16:19:04 -0700
message:
  Small cleanup for src/Makefile liblw.a, libXMenu11.a rules
  
  * src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
  Remove prerequisites, sub-makes will figure it out.
  (FORCE): Remove.
  (mostlyclean): There are no libXMenu11.a, liblw.a in this directory.
  
  * oldXMenu/deps.mk (${OBJS}): Depend on ../src/config.h.
modified:
  oldXMenu/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-1572
  oldXMenu/deps.mk               deps.mk-20140628225059-9nnp5jfa6b89utgv-1
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2014-06-28 22:57:23 +0000
+++ b/oldXMenu/ChangeLog        2014-06-28 23:19:04 +0000
@@ -1,5 +1,7 @@
 2014-06-28  Glenn Morris  <address@hidden>
 
+       * deps.mk (${OBJS}): Depend on ../src/config.h.
+
        * Makefile.in: Use gcc auto-dependency information.
        Move old dependency information to new file deps.mk.
        (MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag):

=== modified file 'oldXMenu/deps.mk'
--- a/oldXMenu/deps.mk  2014-06-28 22:57:23 +0000
+++ b/oldXMenu/deps.mk  2014-06-28 23:19:04 +0000
@@ -67,4 +67,6 @@
 XMakeAssoc.o: XMakeAssoc.c X10.h
 insque.o: insque.c
 
+${OBJS}: ../src/config.h
+
 ### deps.mk ends here

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-28 17:27:29 +0000
+++ b/src/ChangeLog     2014-06-28 23:19:04 +0000
@@ -1,3 +1,10 @@
+2014-06-28  Glenn Morris  <address@hidden>
+
+       * Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
+       Remove prerequisites, sub-makes will figure it out.
+       (FORCE): Remove.
+       (mostlyclean): There are no libXMenu11.a, liblw.a in this directory.
+
 2014-06-28  Andreas Schwab  <address@hidden>
 
        * coding.c (encode_coding_utf_8): Correctly count produced_chars

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-06-27 00:41:23 +0000
+++ b/src/Makefile.in   2014-06-28 23:19:04 +0000
@@ -498,12 +498,10 @@
 
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
-$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE
+$(lwlibdir)/liblw.a:
        $(MAKE) -C $(lwlibdir) liblw.a
-$(oldXMenudir)/libXMenu11.a: FORCE
+$(oldXMenudir)/libXMenu11.a:
        $(MAKE) -C $(oldXMenudir) libXMenu11.a
-FORCE:
-.PHONY: FORCE
 
 ../config.status: config.in epaths.in
        @echo "The file ${?:.in=.h} needs to be set up from $?."
@@ -525,7 +523,7 @@
 .PHONY: versionclean extraclean
 
 mostlyclean:
-       rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a
+       rm -f temacs$(EXEEXT) core *.core \#* *.o
        rm -f ../etc/DOC
        rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
        rm -f buildobj.h