aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristoph Scholtes2011-02-20 20:50:26 +0200
committerEli Zaretskii2011-02-20 20:50:26 +0200
commit32159fc37e0281a54dd35abb17aac7302104fd5e (patch)
tree22d02709522cd5015107f09b03c79cce41606843 /lib
parentbdfbdbb2197aa835bf8c09de964f7ba0cf086633 (diff)
downloademacs-32159fc37e0281a54dd35abb17aac7302104fd5e.tar.gz
emacs-32159fc37e0281a54dd35abb17aac7302104fd5e.zip
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/makefile.w32-in13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index cdf44f614b6..c60d85aa01c 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -27,7 +27,8 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
27 $(BLD)/getopt.$(O) \ 27 $(BLD)/getopt.$(O) \
28 $(BLD)/getopt1.$(O) \ 28 $(BLD)/getopt1.$(O) \
29 $(BLD)/strftime.$(O) \ 29 $(BLD)/strftime.$(O) \
30 $(BLD)/time_r.$(O) 30 $(BLD)/time_r.$(O) \
31 $(BLD)/md5.$(O)
31 32
32# 33#
33# Build the library 34# Build the library
@@ -93,11 +94,19 @@ $(BLD)/time_r.$(O) : \
93 $(EMACS_ROOT)/src/m/intel386.h \ 94 $(EMACS_ROOT)/src/m/intel386.h \
94 $(EMACS_ROOT)/src/config.h 95 $(EMACS_ROOT)/src/config.h
95 96
97$(BLD)/md5.$(O) : \
98 $(EMACS_ROOT)/lib/md5.c \
99 $(EMACS_ROOT)/src/s/ms-w32.h \
100 $(EMACS_ROOT)/src/m/intel386.h \
101 $(EMACS_ROOT)/src/config.h \
102 $(EMACS_ROOT)/nt/inc/sys/stat.h \
103 $(EMACS_ROOT)/lib/md5.h
104
96# The following dependencies are for supporting parallel builds, where 105# The following dependencies are for supporting parallel builds, where
97# we must make sure $(BLD) exists before any compilation starts. 106# we must make sure $(BLD) exists before any compilation starts.
98# 107#
99$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD 108$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
100$(BLD)/strftime.$(O) $(BLD)/time_r.$(O): stamp_BLD 109$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
101 110
102# 111#
103# Headers we would preprocess if we could. 112# Headers we would preprocess if we could.