Re: How many more gnulib imports?

[Christoph <cschol2112@googlemail.com>]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

On 2/20/2011 8:56 AM, I wrote:

> In regards to the md5 change, I think I have a patch to fix the Windows
> build. I will send it for review once my bootstrap finishes and I see
> everything works. Shouldn't be too long.

Find the patch fixing the Windows build for including lib/md5.c attached.

Christoph

[-- Attachment #2: md5-fix-v1.txt --]
[-- Type: text/plain, Size: 2429 bytes --]

=== modified file 'lib/makefile.w32-in'
--- lib/makefile.w32-in	2011-01-31 19:36:08 +0000
+++ lib/makefile.w32-in	2011-02-20 15:49:09 +0000
@@ -27,7 +27,8 @@
 	     $(BLD)/getopt.$(O)  \
 	     $(BLD)/getopt1.$(O) \
 	     $(BLD)/strftime.$(O) \
-	     $(BLD)/time_r.$(O)
+	     $(BLD)/time_r.$(O) \
+	     $(BLD)/md5.$(O)
 
 #
 # Build the library
@@ -93,6 +94,14 @@
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h
 
+$(BLD)/md5.$(O) : \
+	$(EMACS_ROOT)/lib/md5.c \
+	$(EMACS_ROOT)/src/s/ms-w32.h \
+	$(EMACS_ROOT)/src/m/intel386.h \
+	$(EMACS_ROOT)/src/config.h \
+	$(EMACS_ROOT)/nt/inc/sys/stat.h \
+	$(EMACS_ROOT)/lib/md5.h
+    
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-02-20 08:48:52 +0000
+++ src/ChangeLog	2011-02-20 16:08:30 +0000
@@ -1,3 +1,8 @@
+2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+
+	* makefile.w32-in: Remove md5.$(O).
+	($(BLD)/md5.$(O)): Remove prerequisites.
+
 2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Import crypto/md5 and stdint modules from gnulib.

=== modified file 'src/makefile.w32-in'
--- src/makefile.w32-in	2011-02-09 20:50:17 +0000
+++ src/makefile.w32-in	2011-02-20 15:43:20 +0000
@@ -81,7 +81,6 @@
 	$(BLD)/lread.$(O)		\
 	$(BLD)/macros.$(O)		\
 	$(BLD)/marker.$(O)		\
-	$(BLD)/md5.$(O)                 \
 	$(BLD)/minibuf.$(O)		\
 	$(BLD)/w32.$(O)			\
 	$(BLD)/w32heap.$(O)		\
@@ -221,7 +220,7 @@
 	syntax.c bytecode.c \
 	process.c callproc.c unexw32.c \
 	region-cache.c sound.c atimer.c \
-	doprnt.c intervals.c textprop.c composite.c md5.c
+	doprnt.c intervals.c textprop.c composite.c
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
 obj = $(GLOBAL_SOURCES:.c=.o)
@@ -843,6 +842,7 @@
 	$(EMACS_ROOT)/nt/inc/nl_types.h \
 	$(EMACS_ROOT)/nt/inc/unistd.h \
 	$(EMACS_ROOT)/nt/inc/sys/time.h \
+    $(EMACS_ROOT)/lib/md5.h \
 	$(LISP_H) \
 	$(SRC)/atimer.h \
 	$(SRC)/blockinput.h \
@@ -856,7 +856,6 @@
 	$(SRC)/intervals.h \
 	$(SRC)/keyboard.h \
 	$(SRC)/keymap.h \
-	$(SRC)/md5.h \
 	$(SRC)/systime.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/window.h
@@ -1135,11 +1134,6 @@
 	$(SRC)/buffer.h \
 	$(SRC)/character.h
 
-$(BLD)/md5.$(O) : \
-	$(SRC)/md5.c \
-	$(CONFIG_H) \
-	$(SRC)/md5.h
-
 $(BLD)/menu.$(O) : \
 	$(SRC)/menu.c \
 	$(CONFIG_H) \