[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 01/01: Reduce nt and src Makefile duplication wrt e
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 01/01: Reduce nt and src Makefile duplication wrt emacs.res |
Date: |
Mon, 24 Nov 2014 00:17:08 +0000 |
branch: master
commit 825351bcce8a6697905310793d82c57449500755
Author: Glenn Morris <address@hidden>
Date: Sun Nov 23 16:16:57 2014 -0800
Reduce nt and src Makefile duplication wrt emacs.res
* nt/Makefile.in (../src/emacs.res): New target.
* src/Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it.
(ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused.
---
nt/ChangeLog | 4 ++++
nt/Makefile.in | 4 ++--
src/ChangeLog | 5 +++++
src/Makefile.in | 12 ++----------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 168f1dd..01dc0b1 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-24 Glenn Morris <address@hidden>
+
+ * Makefile.in (../src/emacs.res): New target.
+
2014-11-22 Glenn Morris <address@hidden>
* emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc.
diff --git a/nt/Makefile.in b/nt/Makefile.in
index c6b2f0b..56e3e82 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -224,7 +224,7 @@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
$(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
-## This rule (and file) is duplicated in src/: why?
-emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
+## Also used in ../src/Makefile.
+emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
${WINDRES} -I ${srcdir} -O coff -o $@ $<
diff --git a/src/ChangeLog b/src/ChangeLog
index b7c9a95..8d5f786 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24 Glenn Morris <address@hidden>
+
+ * Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it.
+ (ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused.
+
2014-11-23 Lars Magne Ingebrigtsen <address@hidden>
* gnutls.c: Fix Windows function definition of
diff --git a/src/Makefile.in b/src/Makefile.in
index 4bc5fdfa..61cb938 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,10 +31,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
# MinGW CPPFLAGS may use this.
address@hidden@
-ntsource = $(top_srcdir)/nt
VPATH = $(srcdir)
CC = @CC@
-WINDRES = @WINDRES@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
@@ -264,8 +262,6 @@ address@hidden@
## emacs.res if HAVE_W32
EMACSRES = @EMACSRES@
-## emacs-*.manifest if HAVE_W32
-EMACS_MANIFEST = @EMACS_MANIFEST@
## If HAVE_W32, compiler arguments for including
## the resource file in the binary.
## Cygwin: -Wl,emacs.res
@@ -548,12 +544,8 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in
../config.status \
doc.o: buildobj.h
-## This rule (and file) is duplicated in nt/: why?
-emacs.res: ../nt/emacs.rc \
- $(ntsource)/icons/emacs.ico \
- $(ntsource)/icons/hand.cur \
- $(ntsource)/$(EMACS_MANIFEST)
- $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt -o $@ $<
+emacs.res: FORCE
+ $(MAKE) -C ../nt ../src/emacs.res
.PHONY: ns-app
ns-app: emacs$(EXEEXT)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 01/01: Reduce nt and src Makefile duplication wrt emacs.res,
Glenn Morris <=