aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-06-28 16:19:04 -0700
committerGlenn Morris2014-06-28 16:19:04 -0700
commit8aa079fb75ff54590e6f3e2afad43e1594bd1e99 (patch)
treeb90f99f84115ae16043c9caab0ee16416dceb108 /src
parent93160ec3928b5efd654824dfc727d1bbec3c0aec (diff)
downloademacs-8aa079fb75ff54590e6f3e2afad43e1594bd1e99.tar.gz
emacs-8aa079fb75ff54590e6f3e2afad43e1594bd1e99.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/Makefile.in8
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f1b3fdf6b8..d96af327e47 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12014-06-28 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
4 Remove prerequisites, sub-makes will figure it out.
5 (FORCE): Remove.
6 (mostlyclean): There are no libXMenu11.a, liblw.a in this directory.
7
12014-06-28 Andreas Schwab <schwab@linux-m68k.org> 82014-06-28 Andreas Schwab <schwab@linux-m68k.org>
2 9
3 * coding.c (encode_coding_utf_8): Correctly count produced_chars 10 * 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) \
498 498
499## The following oldxmenu-related rules are only (possibly) used if 499## The following oldxmenu-related rules are only (possibly) used if
500## HAVE_X11 && !USE_GTK, but there is no harm in always defining them. 500## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
501$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE 501$(lwlibdir)/liblw.a:
502 $(MAKE) -C $(lwlibdir) liblw.a 502 $(MAKE) -C $(lwlibdir) liblw.a
503$(oldXMenudir)/libXMenu11.a: FORCE 503$(oldXMenudir)/libXMenu11.a:
504 $(MAKE) -C $(oldXMenudir) libXMenu11.a 504 $(MAKE) -C $(oldXMenudir) libXMenu11.a
505FORCE:
506.PHONY: FORCE
507 505
508../config.status: config.in epaths.in 506../config.status: config.in epaths.in
509 @echo "The file ${?:.in=.h} needs to be set up from $?." 507 @echo "The file ${?:.in=.h} needs to be set up from $?."
@@ -525,7 +523,7 @@ ns-app: emacs$(EXEEXT)
525.PHONY: versionclean extraclean 523.PHONY: versionclean extraclean
526 524
527mostlyclean: 525mostlyclean:
528 rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a 526 rm -f temacs$(EXEEXT) core *.core \#* *.o
529 rm -f ../etc/DOC 527 rm -f ../etc/DOC
530 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) 528 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
531 rm -f buildobj.h 529 rm -f buildobj.h