[Emacs-diffs] /srv/bzr/emacs/trunk r103365: Fix the MS-Windows build due to import of md5 from gnulib.

[Eli Zaretskii]

------------------------------------------------------------
revno: 103365
author: Christoph Scholtes <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-20 20:50:26 +0200
message:
  Fix the MS-Windows build due to import of md5 from gnulib.
  
   src/makefile.w32-in: Remove md5.$(O).
   ($(BLD)/md5.$(O)): Remove prerequisites, moved to
   lib/makefile.w32-in.
   ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
   lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
   src/makefile.w32-in.
modified:
  ChangeLog
  lib/makefile.w32-in
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-20 08:48:52 +0000
+++ b/ChangeLog 2011-02-20 18:50:26 +0000
@@ -1,3 +1,8 @@
+2011-02-20  Christoph Scholtes <address@hidden>
+
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
+       src/makefile.w32-in.
+
 2011-02-20  Paul Eggert  <address@hidden>
 
        Import crypto/md5 and stdint modules from gnulib.

=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in       2011-01-31 19:36:08 +0000
+++ b/lib/makefile.w32-in       2011-02-20 18:50:26 +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,11 +94,19 @@
        $(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.
 #
 $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
-$(BLD)/strftime.$(O) $(BLD)/time_r.$(O): stamp_BLD
+$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
 
 #
 # Headers we would preprocess if we could.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-20 08:48:52 +0000
+++ b/src/ChangeLog     2011-02-20 18:50:26 +0000
@@ -1,3 +1,14 @@
+2011-02-20  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in ($(BLD)/fns.$(O)): Depend on
+       $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
+
+2011-02-20  Christoph Scholtes <address@hidden>
+
+       * makefile.w32-in: Remove md5.$(O).
+       ($(BLD)/md5.$(O)): Remove prerequisites, moved to
+       lib/makefile.w32-in.
+
 2011-02-20  Paul Eggert  <address@hidden>
 
        Import crypto/md5 and stdint modules from gnulib.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2011-02-09 20:50:17 +0000
+++ b/src/makefile.w32-in       2011-02-20 18:50:26 +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) \