diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:52:35 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:52:35 -0800 |
| commit | 743fa5cbdd42a820c4320599a14aab925dcdbc8b (patch) | |
| tree | 7c330bf115347bbb0fa87b59f88c87a50745d432 /src/Makefile.in | |
| parent | 98a07056558be8c13945a3a99b4801996af685a4 (diff) | |
| parent | 1cf1bbd51e91f02a1d3fabb4f7ea4b1322c4259c (diff) | |
| download | emacs-743fa5cbdd42a820c4320599a14aab925dcdbc8b.tar.gz | |
Move fix for cygw32 icon issue from emacs-24 branch to trunk as Stefan Monnier requests
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index cd0b9318ccb..5f5fdfdc5eb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -28,9 +28,11 @@ SHELL = /bin/sh # Here are the things that we expect ../configure to edit. # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. srcdir = @srcdir@ +ntsource = $(srcdir)/../nt abs_builddir = @abs_builddir@ VPATH = $(srcdir) CC = @CC@ +WINDRES = @WINDRES@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -267,6 +269,13 @@ W32_OBJ=@W32_OBJ@ ## --lwinspool if HAVE_W32, else empty. W32_LIBS=@W32_LIBS@ +## emacs.res if HAVE_W32 +W32_RES=@W32_RES@ +## If HAVE_W32, compiler arguments for including +## the resource file in the binary. +## XXX -Wl,-b -Wl,pe-i386 -Wl,emacs.res +W32_RES_LINK=@W32_RES_LINK@ + ## Empty if !HAVE_X_WINDOWS ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT ## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE @@ -329,7 +338,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) @$(MKDEPDIR) $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< - ## lastfile must follow all files whose initialized data areas should ## be dumped as pure by dump-emacs. base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ @@ -463,9 +471,11 @@ $(obj) $(otherobj): globals.h $(lib)/libgnu.a: $(config_h) cd $(lib) && $(MAKE) libgnu.a -temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a +temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) \ + $(lib)/libgnu.a $(W32_RES) $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ - -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) + -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) \ + $(W32_RES_LINK) test "$(CANNOT_DUMP)" = "yes" || \ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) @@ -506,11 +516,14 @@ $(OLDXMENU): $(OLDXMENU_TARGET) doc.o: buildobj.h +emacs.res: $(ntsource)/emacs.rc \ + $(ntsource)/icons/emacs.ico \ + $(ntsource)/emacs-x86.manifest + $(WINDRES) -O COFF -o $@ $(ntsource)/emacs.rc ns-app: emacs$(EXEEXT) cd ../nextstep && $(MAKE) $(MFLAGS) all - .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean .PHONY: versionclean extraclean frc |