From: Glenn Morris <rgm@gnu.org>
Date: Mon, 24 Nov 2014 00:16:57 +0000 (-0800)
Subject: Reduce nt and src Makefile duplication wrt emacs.res
X-Git-Tag: emacs-25.0.90~2635^2~353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=825351bcce8a6697905310793d82c57449500755;p=emacs.git

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.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 168f1dd9ed3..01dc0b1feed 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-24  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (../src/emacs.res): New target.
+
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc.
diff --git a/nt/Makefile.in b/nt/Makefile.in
index c6b2f0bea0e..56e3e82ac80 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 b7c9a957d22..8d5f78671d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (emacs.res): Use ../nt rule, rather than duplicating it.
+	(ntsource, WINDRES, EMACS_MANIFEST): Remove, now unused.
+
 2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnutls.c: Fix Windows function definition of
diff --git a/src/Makefile.in b/src/Makefile.in
index 4bc5fdfaaf5..61cb938aeff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,10 +31,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 # MinGW CPPFLAGS may use this.
 abs_top_srcdir=@abs_top_srcdir@
-ntsource = $(top_srcdir)/nt
 VPATH = $(srcdir)
 CC = @CC@
-WINDRES = @WINDRES@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
@@ -264,8 +262,6 @@ W32_LIBS=@W32_LIBS@
 
 ## 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)