Commit 8aa079fb authored by Glenn Morris's avatar Glenn Morris

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.
parent 93160ec3
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):
......
......@@ -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
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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment