[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110459: Fix w32 dependencies due to
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110459: Fix w32 dependencies due to introduction of w32common.h. |
Date: |
Mon, 08 Oct 2012 15:31:14 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110459
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 15:31:14 +0200
message:
Fix w32 dependencies due to introduction of w32common.h.
src/makefile.w32-in ($(BLD)/unexw32.$(O)):
($(BLD)/w32.$(O)):
($(BLD)/w32console.$(O)):
($(BLD)/w32fns.$(O)):
($(BLD)/w32heap.$(O)):
($(BLD)/w32menu.$(O)):
($(BLD)/w32proc.$(O)): Add w32common.h.
modified:
src/ChangeLog
src/makefile.w32-in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-08 12:53:18 +0000
+++ b/src/ChangeLog 2012-10-08 13:31:14 +0000
@@ -4,6 +4,13 @@
(W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
(GLOBAL_SOURCES): Add cygw32.c.
+ ($(BLD)/unexw32.$(O)):
+ ($(BLD)/w32.$(O)):
+ ($(BLD)/w32console.$(O)):
+ ($(BLD)/w32fns.$(O)):
+ ($(BLD)/w32heap.$(O)):
+ ($(BLD)/w32menu.$(O)):
+ ($(BLD)/w32proc.$(O)): Add w32common.h.
* w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
'const char *'.
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2012-10-08 12:21:04 +0000
+++ b/src/makefile.w32-in 2012-10-08 13:31:14 +0000
@@ -1172,6 +1172,7 @@
$(SRC)/w32.c \
$(SRC)/ndir.h \
$(SRC)/w32.h \
+ $(SRC)/w32common.h \
$(SRC)/w32heap.h \
$(NT_INC)/pwd.h \
$(NT_INC)/sys/file.h \
@@ -1190,6 +1191,7 @@
$(BLD)/w32heap.$(O) : \
$(SRC)/w32heap.c \
$(SRC)/w32heap.h \
+ $(SRC)/w32common.h \
$(CONFIG_H) \
$(LISP_H)
@@ -1212,6 +1214,7 @@
$(SRC)/w32proc.c \
$(SRC)/syswait.h \
$(SRC)/w32.h \
+ $(SRC)/w32common.h \
$(SRC)/w32heap.h \
$(NT_INC)/nl_types.h \
$(NT_INC)/sys/file.h \
@@ -1229,7 +1232,7 @@
$(SRC)/w32console.c \
$(SRC)/disptab.h \
$(SRC)/termchar.h \
- $(SRC)/w32heap.h \
+ $(SRC)/w32common.h \
$(SRC)/w32inevt.h \
$(CHARACTER_H) \
$(CODING_H) \
@@ -1467,6 +1470,7 @@
$(BLD)/unexw32.$(O) : \
$(SRC)/unexw32.c \
$(SRC)/unexec.h \
+ $(SRC)/w32common.h \
$(SRC)/w32heap.h \
$(CONFIG_H)
@@ -1553,6 +1557,7 @@
$(SRC)/epaths.h \
$(SRC)/fontset.h \
$(SRC)/w32.h \
+ $(SRC)/w32common.h \
$(SRC)/w32heap.h \
$(BUFFER_H) \
$(CCL_H) \
@@ -1576,7 +1581,7 @@
$(SRC)/w32menu.c \
$(SRC)/blockinput.h \
$(SRC)/keymap.h \
- $(SRC)/w32heap.h \
+ $(SRC)/w32common.h \
$(BUFFER_H) \
$(CHARACTER_H) \
$(CHARSET_H) \
@@ -1626,7 +1631,7 @@
$(SRC)/w32select.c \
$(SRC)/blockinput.h \
$(SRC)/composite.h \
- $(SRC)/w32heap.h \
+ $(SRC)/w32common.h \
$(CHARSET_H) \
$(CODING_H) \
$(CONFIG_H) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110459: Fix w32 dependencies due to introduction of w32common.h.,
Eli Zaretskii <=