aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-07-17 01:40:44 +0200
committerJuanma Barranquero2011-07-17 01:40:44 +0200
commitb56414357f0437381231bebf4c38baee9d7e86a8 (patch)
treef2139f26f3e65fd65774388aa78e31423ae0a0f4 /src
parent750c33f71e7281e651f7315689f9085a1d0894d7 (diff)
downloademacs-b56414357f0437381231bebf4c38baee9d7e86a8.tar.gz
emacs-b56414357f0437381231bebf4c38baee9d7e86a8.zip
src/makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/makefile.w32-in3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 27a375c978d..7f8717176b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-07-16 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).
4
12011-07-16 Paul Eggert <eggert@cs.ucla.edu> 52011-07-16 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * fileio.c (Fcopy_file): Don't diagnose fchown failures. (Bug#9002) 7 * fileio.c (Fcopy_file): Don't diagnose fchown failures. (Bug#9002)
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 88b53554925..fd29dec9096 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -221,7 +221,8 @@ GLOBAL_SOURCES = dosfns.c msdos.c \
221 syntax.c bytecode.c \ 221 syntax.c bytecode.c \
222 process.c callproc.c unexw32.c \ 222 process.c callproc.c unexw32.c \
223 region-cache.c sound.c atimer.c \ 223 region-cache.c sound.c atimer.c \
224 doprnt.c intervals.c textprop.c composite.c 224 doprnt.c intervals.c textprop.c composite.c \
225 gnutls.c
225SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ 226SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
226 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o 227 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
227obj = $(GLOBAL_SOURCES:.c=.o) 228obj = $(GLOBAL_SOURCES:.c=.o)