some conflict resolution

2 files changed, 16 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 480ddabd44a..866e76ad24f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (SYSWAIT_H): Update dependencies.
+
+2012-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (obj): Add w32notify.o.  Add missing X and Unix
+        sources.
+
 2012-12-02  Kevin Ryde  <user42@zip.com.au>
 
         * etags.c (Lisp_functions): Skip (defvar foo) declarations unless
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index cbd29f32cfe..24be44e22f2 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -123,10 +123,13 @@ $(BLD)/profile.exe:	$(PROFILEOBJS)
 #
 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 cygw32.o \
+        fontset.o menu.o dbusbind.o cygw32.o \
+        nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
+        w32.o w32console.o w32fns.o w32heap.o w32inevt.o w32notify.o \
         w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
-        font.o w32font.o w32uniscribe.o \
+        w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \
+        xsettings.o xgselect.o termcap.o \
+        font.o w32font.o w32uniscribe.o w32notify.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 \
@@ -375,6 +378,7 @@ SYSTIME_H      = $(SRC)/systime.h \
                  $(NT_INC)/sys/time.h \
                  $(GNU_LIB)/timespec.h
 SYSWAIT_H      = $(SRC)/syswait.h \
+                 $(NT_INC)/stdbool.h \
                  $(NT_INC)/sys/wait.h
 
 $(BLD)/ctags.$(O) : \