diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:55:03 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-12-10 09:55:03 -0800 |
| commit | 78f9ea875a65686b5e300d73dbf22dd96ca29851 (patch) | |
| tree | d30e965b537930a2c7ba999210ae56651562ac26 /src/Makefile.in | |
| parent | 322a542e6c13eb89b8abc302278e77684c1d6479 (diff) | |
| download | emacs-78f9ea875a65686b5e300d73dbf22dd96ca29851.tar.gz | |
Move fix for bug#12993 to trunk
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 75624dc0631..c24e421bbbc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -28,11 +28,9 @@ 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@ @@ -268,13 +266,6 @@ 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 @@ -337,6 +328,7 @@ 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 \ @@ -470,11 +462,9 @@ $(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 $(W32_RES) +temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ - -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) \ - $(W32_RES_LINK) + -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) test "$(CANNOT_DUMP)" = "yes" || \ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) @@ -515,14 +505,11 @@ $(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 |