aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2013-05-08 18:21:19 +0200
committerJuanma Barranquero2013-05-08 18:21:19 +0200
commitd901fc8d6f4ec8de329f4c9844ab401d1364607b (patch)
tree6da521243055077ea3ced66ffa845f8ee59fe0f4 /src
parent72d3cfca0a6a0dafaaa0fa271ac1934c9f836134 (diff)
downloademacs-d901fc8d6f4ec8de329f4c9844ab401d1364607b.tar.gz
emacs-d901fc8d6f4ec8de329f4c9844ab401d1364607b.zip
src/makefile.w32-in (ACL_H): New macro.
($(BLD)/fileio.$(O)): Update dependencies.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/makefile.w32-in4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1085bc0b870..64b76af0b85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-05-08 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (ACL_H): New macro.
4 ($(BLD)/fileio.$(O)): Update dependencies.
5
12013-05-07 Paul Eggert <eggert@cs.ucla.edu> 62013-05-07 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295) 8 Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index aacc258cd11..3484d6c70c8 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -388,6 +388,9 @@ EMACS_ROOT = ..
388GNU_LIB = $(EMACS_ROOT)/lib 388GNU_LIB = $(EMACS_ROOT)/lib
389NT_INC = $(EMACS_ROOT)/nt/inc 389NT_INC = $(EMACS_ROOT)/nt/inc
390 390
391ACL_H = $(GNU_LIB)/acl.h \
392 $(NT_INC)/sys/stat.h \
393 $(NT_INC)/stdbool.h
391SYSTIME_H = $(SRC)/systime.h \ 394SYSTIME_H = $(SRC)/systime.h \
392 $(NT_INC)/sys/time.h \ 395 $(NT_INC)/sys/time.h \
393 $(GNU_LIB)/timespec.h 396 $(GNU_LIB)/timespec.h
@@ -848,6 +851,7 @@ $(BLD)/fileio.$(O) : \
848 $(NT_INC)/sys/stat.h \ 851 $(NT_INC)/sys/stat.h \
849 $(NT_INC)/unistd.h \ 852 $(NT_INC)/unistd.h \
850 $(GNU_LIB)/allocator.h \ 853 $(GNU_LIB)/allocator.h \
854 $(ACL_H) \
851 $(BUFFER_H) \ 855 $(BUFFER_H) \
852 $(CAREADLINKAT_H) \ 856 $(CAREADLINKAT_H) \
853 $(CHARACTER_H) \ 857 $(CHARACTER_H) \