[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110457: Update w32 dependencies in t
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110457: Update w32 dependencies in the wake of cygw32 changes. |
Date: |
Mon, 08 Oct 2012 14:21:04 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110457
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 14:21:04 +0200
message:
Update w32 dependencies in the wake of cygw32 changes.
src/makefile.w32-in (FONT_H): Add $(FRAME_H).
(W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
(GLOBAL_SOURCES): Add cygw32.c.
lib-src/makefile.w32-in (obj): Add cygw32.o.
modified:
lib-src/ChangeLog
lib-src/makefile.w32-in
src/ChangeLog
src/makefile.w32-in
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-10-08 07:58:40 +0000
+++ b/lib-src/ChangeLog 2012-10-08 12:21:04 +0000
@@ -1,3 +1,7 @@
+2012-10-08 Eli Zaretskii <address@hidden>
+
+ * makefile.w32-in (obj): Add cygw32.o.
+
2012-10-08 Daniel Colascione <address@hidden>
* emacsclient.c: Include windows.h when HAVE_NTGUI.
=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in 2012-09-26 22:04:10 +0000
+++ b/lib-src/makefile.w32-in 2012-10-08 12:21:04 +0000
@@ -124,7 +124,7 @@
obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o menu.o \
- w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
+ w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
font.o w32font.o w32uniscribe.o \
dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-08 11:19:35 +0000
+++ b/src/ChangeLog 2012-10-08 12:21:04 +0000
@@ -1,5 +1,10 @@
2012-10-08 Eli Zaretskii <address@hidden>
+ * makefile.w32-in (FONT_H): Add $(FRAME_H).
+ (W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
+ ($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
+ (GLOBAL_SOURCES): Add cygw32.c.
+
* w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
'const char *'.
(x_to_w32_color): Don't modify the argument, modify a copy instead.
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2012-10-02 00:08:54 +0000
+++ b/src/makefile.w32-in 2012-10-08 12:21:04 +0000
@@ -207,7 +207,7 @@
GLOBAL_SOURCES = dosfns.c msdos.c \
xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
fontset.c menu.c dbusbind.c \
- w32.c w32console.c w32fns.c w32heap.c w32inevt.c \
+ w32.c w32console.c w32fns.c w32heap.c w32inevt.c cygw32.c \
w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
font.c w32font.c w32uniscribe.c \
dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
@@ -424,6 +424,7 @@
FILEMODE_H = $(GNU_LIB)/filemode.h \
$(NT_INC)/sys/stat.h
FONT_H = $(SRC)/font.h \
+ $(FRAME_H) \
$(CCL_H)
FRAME_H = $(SRC)/frame.h \
$(DISPEXTERN_H)
@@ -476,6 +477,8 @@
W32FONT_H = $(SRC)/w32font.h \
$(FONT_H)
W32TERM_H = $(SRC)/w32term.h \
+ $(ATIMER_H) \
+ $(FRAME_H) \
$(W32GUI_H)
WINDOW_H = $(SRC)/window.h \
$(DISPEXTERN_H)
@@ -796,6 +799,8 @@
$(SRC)/unexec.h \
$(SRC)/w32.h \
$(SRC)/w32heap.h \
+ $(SRC)/w32select.h \
+ $(SRC)/w32font.h \
$(NT_INC)/sys/file.h \
$(NT_INC)/unistd.h \
$(GNU_LIB)/ignore-value.h \
@@ -1233,6 +1238,7 @@
$(FRAME_H) \
$(LISP_H) \
$(TERMHOOKS_H) \
+ $(W32TERM_H) \
$(WINDOW_H)
$(BLD)/print.$(O) : \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110457: Update w32 dependencies in the wake of cygw32 changes.,
Eli Zaretskii <=