HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib-src/makefile.w32-in (../src/config.h): Remove target, it is stale.
[bpt/emacs.git]
/
lib-src
/
makefile.w32-in
diff --git
a/lib-src/makefile.w32-in
b/lib-src/makefile.w32-in
index
9c1def4
..
552dd13
100644
(file)
--- a/
lib-src/makefile.w32-in
+++ b/
lib-src/makefile.w32-in
@@
-1,6
+1,6
@@
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 200
8, 2009
Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
2008,
+# 200
9, 2010
Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# This file is part of GNU Emacs.
@@
-22,7
+22,7
@@
ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
.PHONY: $(ALL)
-VERSION = 2
3.0.9
0
+VERSION = 2
4.0.5
0
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
@@
-143,11
+143,11
@@
$(BLD)/ctags.$(O): ctags.c
#
obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
#
obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
- fontset.o \
+ fontset.o
menu.o
\
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
- font.o w32font.o \
- dispnew.o frame.o scroll.o xdisp.o window.o \
+ font.o w32font.o
w32uniscribe.o
\
+ dispnew.o frame.o scroll.o xdisp.o window.o
bidi.o
\
charset.o coding.o category.o ccl.o character.o chartab.o \
cm.o term.o terminal.o xfaces.o \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
charset.o coding.o category.o ccl.o character.o chartab.o \
cm.o term.o terminal.o xfaces.o \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
@@
-157,7
+157,7
@@
obj = dosfns.o msdos.o \
alloc.o data.o doc.o editfns.o callint.o \
eval.o floatfns.o fns.o print.o lread.o \
syntax.o bytecode.o \
alloc.o data.o doc.o editfns.o callint.o \
eval.o floatfns.o fns.o print.o lread.o \
syntax.o bytecode.o \
- process.o callproc.o \
+ process.o callproc.o
unexw32.o
\
region-cache.o sound.o atimer.o \
doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
region-cache.o sound.o atimer.o \
doprnt.o strftime.o intervals.o textprop.o composite.o md5.o
@@
-176,6
+176,7
@@
WINNT_SUPPORT = \
$(lispsource)w32-fns.elc \
$(lispsource)dos-w32.elc \
$(lispsource)w32-vars.elc \
$(lispsource)w32-fns.elc \
$(lispsource)dos-w32.elc \
$(lispsource)w32-vars.elc \
+ $(lispsource)term/common-win.elc \
$(lispsource)term/w32-win.elc
TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
WINDOW_SUPPORT = \
$(lispsource)term/w32-win.elc
TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
WINDOW_SUPPORT = \
@@
-190,8
+191,12
@@
WINDOW_SUPPORT = \
OTHER_PLATFORM_SUPPORT = \
$(lispsource)dos-fns.elc \
$(lispsource)dos-vars.elc \
OTHER_PLATFORM_SUPPORT = \
$(lispsource)dos-fns.elc \
$(lispsource)dos-vars.elc \
+ $(lispsource)term/internal.elc \
+ $(lispsource)term/pc-win.elc \
$(lispsource)x-dnd.elc \
$(lispsource)x-dnd.elc \
- $(lispsource)term/x-win.elc
+ $(lispsource)term/x-win.elc \
+ $(lispsource)emacs-lisp/easymenu.elc \
+ $(lispsource)term/ns-win.elc
lisp1= \
lisp1= \
@@
-242,7
+247,7
@@
lisp2 = \
$(lispsource)language/slovak.el \
$(lispsource)language/romanian.el \
$(lispsource)language/greek.el \
$(lispsource)language/slovak.el \
$(lispsource)language/romanian.el \
$(lispsource)language/greek.el \
- $(lispsource)language/hebrew.el \
+ $(lispsource)language/hebrew.el
c
\
$(lispsource)language/japanese.el \
$(lispsource)language/korean.el \
$(lispsource)language/lao.el \
$(lispsource)language/japanese.el \
$(lispsource)language/korean.el \
$(lispsource)language/lao.el \
@@
-274,8
+279,8
@@
lisp2 = \
$(lispsource)textmodes/text-mode.elc \
$(lispsource)emacs-lisp/timer.elc \
$(lispsource)jka-cmpr-hook.elc \
$(lispsource)textmodes/text-mode.elc \
$(lispsource)emacs-lisp/timer.elc \
$(lispsource)jka-cmpr-hook.elc \
- $(lispsource)vc-hooks.elc \
- $(lispsource)ediff-hook.elc \
+ $(lispsource)vc
/vc
-hooks.elc \
+ $(lispsource)
vc/
ediff-hook.elc \
$(lispsource)epa-hook.elc \
$(TOOLTIP_SUPPORT) \
$(WINNT_SUPPORT) \
$(lispsource)epa-hook.elc \
$(TOOLTIP_SUPPORT) \
$(WINNT_SUPPORT) \
@@
-284,6
+289,11
@@
lisp2 = \
$(lispsource)window.elc \
$(lispsource)version.el
$(lispsource)window.elc \
$(lispsource)version.el
+# Used by batch-update-autoloads.
+echolisp:
+ @echo $(lisp1)
+ @echo $(lisp2)
+
# This is needed the first time we build the tree, since temacs.exe
# does not exist yet, and the DOC rule needs it to rebuild DOC whenever
# Emacs is rebuilt.
# This is needed the first time we build the tree, since temacs.exe
# does not exist yet, and the DOC rule needs it to rebuild DOC whenever
# Emacs is rebuilt.
@@
-343,6
+353,7
@@
clean:
- $(DEL) getopt.h
- $(DEL_TREE) $(OBJDIR)
- $(DEL) stamp_BLD
- $(DEL) getopt.h
- $(DEL_TREE) $(OBJDIR)
- $(DEL) stamp_BLD
+ - $(DEL) echolisp.tmp
distclean: cleanall
- $(DEL) TAGS
distclean: cleanall
- $(DEL) TAGS
@@
-360,6
+371,7
@@
cleanall: clean
# Headers we would preprocess if we could.
#
../src/config.h: ../nt/$(CONFIG_H)
# Headers we would preprocess if we could.
#
../src/config.h: ../nt/$(CONFIG_H)
+ $(DEL) $@
echo $(CONFIG_H) has changed. Re-run configure.bat.
exit -1
echo $(CONFIG_H) has changed. Re-run configure.bat.
exit -1