aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-04-14 18:15:31 +0300
committerEli Zaretskii2013-04-14 18:15:31 +0300
commitf1fecede1890d514f1d65b4c804714509e3dc401 (patch)
tree53aa90b39191374dc529f388fa67fb108c271b17 /src
parent5e00cfa51043b42d59061525fecd461d0b2d44f9 (diff)
downloademacs-f1fecede1890d514f1d65b4c804714509e3dc401.tar.gz
emacs-f1fecede1890d514f1d65b4c804714509e3dc401.zip
Fixed linking with the resource file.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 283396acc89..2e56f8f2fe1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -263,9 +263,10 @@ W32_LIBS=@W32_LIBS@
263EMACSRES = @EMACSRES@ 263EMACSRES = @EMACSRES@
264## emacs-*.manifest if HAVE_W32 264## emacs-*.manifest if HAVE_W32
265EMACS_MANIFEST = @EMACS_MANIFEST@ 265EMACS_MANIFEST = @EMACS_MANIFEST@
266## If HAVE_W32 and CYGWIN, compiler arguments for including 266## If HAVE_W32, compiler arguments for including
267## the resource file in the binary. 267## the resource file in the binary.
268## XXX -Wl,-b -Wl,pe-i386 -Wl,emacs.res 268## Cygwin: -Wl,-b -Wl,pe-i386 -Wl,emacs.res
269## MinGW: emacs.res
269W32_RES_LINK=@W32_RES_LINK@ 270W32_RES_LINK=@W32_RES_LINK@
270 271
271## Empty if !HAVE_X_WINDOWS 272## Empty if !HAVE_X_WINDOWS
@@ -481,8 +482,7 @@ $(lib)/libgnu.a: $(config_h)
481temacs$(EXEEXT): stamp-oldxmenu $(ALLOBJS) \ 482temacs$(EXEEXT): stamp-oldxmenu $(ALLOBJS) \
482 $(lib)/libgnu.a $(EMACSRES) 483 $(lib)/libgnu.a $(EMACSRES)
483 $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ 484 $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
484 -o temacs $(ALLOBJS) $(lib)/libgnu.a $(LIBES) \ 485 -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
485 $(W32_RES_LINK)
486 $(TEMACS_POST_LINK) 486 $(TEMACS_POST_LINK)
487 test "$(CANNOT_DUMP)" = "yes" || \ 487 test "$(CANNOT_DUMP)" = "yes" || \
488 test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) 488 test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)