diff options
| -rw-r--r-- | oldXMenu/ChangeLog | 2 | ||||
| -rw-r--r-- | oldXMenu/deps.mk | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 8 |
4 files changed, 14 insertions, 5 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 2d382be5d71..2bccaf2f6ef 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,5 +1,7 @@ 2014-06-28 Glenn Morris <rgm@gnu.org> + * 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): diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk index c5a4966626c..81088c51b1e 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk @@ -67,4 +67,6 @@ XDestAssoc.o: XDestAssoc.c X10.h XMakeAssoc.o: XMakeAssoc.c X10.h insque.o: insque.c +${OBJS}: ../src/config.h + ### deps.mk ends here diff --git a/src/ChangeLog b/src/ChangeLog index 7f1b3fdf6b8..d96af327e47 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-06-28 Glenn Morris <rgm@gnu.org> + + * 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 <schwab@linux-m68k.org> * coding.c (encode_coding_utf_8): Correctly count produced_chars diff --git a/src/Makefile.in b/src/Makefile.in index 748f38e55bd..27d52bdc041 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -498,12 +498,10 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ ## 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 @@ ns-app: emacs$(EXEEXT) .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 |