Commit 825351bc authored by Glenn Morris's avatar Glenn Morris

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.
parent 8c4475f9
2014-11-24 Glenn Morris <rgm@gnu.org>
* Makefile.in (../src/emacs.res): New target.
2014-11-22 Glenn Morris <rgm@gnu.org> 2014-11-22 Glenn Morris <rgm@gnu.org>
* emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc. * emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc.
......
...@@ -224,7 +224,7 @@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c ...@@ -224,7 +224,7 @@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
$(CC) ${ALL_CFLAGS} $^ -mwindows -o $@ $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
## This rule (and file) is duplicated in src/: why? ## Also used in ../src/Makefile.
emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \ emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST) ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
${WINDRES} -I ${srcdir} -O coff -o $@ $< ${WINDRES} -I ${srcdir} -O coff -o $@ $<
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> 2014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnutls.c: Fix Windows function definition of * gnutls.c: Fix Windows function definition of
......
...@@ -31,10 +31,8 @@ srcdir = @srcdir@ ...@@ -31,10 +31,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
# MinGW CPPFLAGS may use this. # MinGW CPPFLAGS may use this.
abs_top_srcdir=@abs_top_srcdir@ abs_top_srcdir=@abs_top_srcdir@
ntsource = $(top_srcdir)/nt
VPATH = $(srcdir) VPATH = $(srcdir)
CC = @CC@ CC = @CC@
WINDRES = @WINDRES@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
...@@ -264,8 +262,6 @@ W32_LIBS=@W32_LIBS@ ...@@ -264,8 +262,6 @@ W32_LIBS=@W32_LIBS@
## emacs.res if HAVE_W32 ## emacs.res if HAVE_W32
EMACSRES = @EMACSRES@ EMACSRES = @EMACSRES@
## emacs-*.manifest if HAVE_W32
EMACS_MANIFEST = @EMACS_MANIFEST@
## If HAVE_W32, compiler arguments for including ## If HAVE_W32, compiler arguments for including
## the resource file in the binary. ## the resource file in the binary.
## Cygwin: -Wl,emacs.res ## Cygwin: -Wl,emacs.res
...@@ -548,12 +544,8 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \ ...@@ -548,12 +544,8 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \
doc.o: buildobj.h doc.o: buildobj.h
## This rule (and file) is duplicated in nt/: why? emacs.res: FORCE
emacs.res: ../nt/emacs.rc \ $(MAKE) -C ../nt ../src/emacs.res
$(ntsource)/icons/emacs.ico \
$(ntsource)/icons/hand.cur \
$(ntsource)/$(EMACS_MANIFEST)
$(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt -o $@ $<
.PHONY: ns-app .PHONY: ns-app
ns-app: emacs$(EXEEXT) ns-app: emacs$(EXEEXT)
......
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