procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the MS-Windows build due to import of md5 from gnulib.

Browse source 
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.
This commit is contained in:
Christoph Scholtes 2011-02-20 20:50:26 +02:00 • committed by Eli Zaretskii
parent bdfbdbb219
commit 32159fc37e
4 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-02-20 Christoph Scholtes <cschol2112@gmail.com>
* lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
src/makefile.w32-in.
2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
Import crypto/md5 and stdint modules from gnulib.

13
lib/makefile.w32-in
View file

@ -27,7 +27,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
$(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 @@ $(BLD)/time_r.$(O) : \
$(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.

11
src/ChangeLog
View file

@ -1,3 +1,14 @@
2011-02-20 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(BLD)/fns.$(O)): Depend on
$(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
2011-02-20 Christoph Scholtes <cschol2112@gmail.com>
* makefile.w32-in: Remove md5.$(O).
($(BLD)/md5.$(O)): Remove prerequisites, moved to
lib/makefile.w32-in.
2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
Import crypto/md5 and stdint modules from gnulib.

10
src/makefile.w32-in
View file

@ -81,7 +81,6 @@ OBJ1 = $(BLD)/alloc.$(O) \
$(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 @@ GLOBAL_SOURCES = dosfns.c msdos.c \
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 @@ $(BLD)/fns.$(O) : \
$(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 @@ $(BLD)/fns.$(O) : \
$(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 @@ $(BLD)/marker.$(O) : \
$(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) \