From 552a99b4cb5474337048053c2e7f0dd9eef9b1cb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 1 Aug 2012 02:29:59 +0200 Subject: Adapt Windows port to recent changes in autogen/config.in. * lib-src/makefile.w32-in (CONFIG_H): Update dependencies. (CONF_POST_H): New macro. * lib/makefile.w32-in (CONFIG_H): Update dependencies. (CONF_POST_H): New macro. * nt/config.nt: Sync with autogen/config.in. Remove code moved to conf_post.h and include (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME) (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros. * src/makefile.w32-in (CONFIG_H): Update dependencies. (CONF_POST_H): New macro. * src/s/ms-w32.h (SEPCHAR, NULL_DEVICE): Remove; moved to nt/config.nt. --- lib-src/ChangeLog | 5 +++++ lib-src/makefile.w32-in | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 2d2bb06cd6f..c5d6ed6eaf0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-01 Juanma Barranquero + + * makefile.w32-in (CONFIG_H): Update dependencies. + (CONF_POST_H): New macro. + 2012-07-30 Paul Eggert Update .PHONY listings in makefiles. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 65e2f7cae25..8c9482b9194 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -362,8 +362,10 @@ GNU_LIB = $(EMACS_ROOT)/lib MS_W32_H = $(SRC)/s/ms-w32.h \ $(NT_INC)/sys/stat.h -CONFIG_H = $(SRC)/config.h \ +CONF_POST_H = $(SRC)/conf_post.h \ $(MS_W32_H) +CONFIG_H = $(SRC)/config.h \ + $(CONF_POST_H) INTTYPES_H = $(NT_INC)/inttypes.h \ $(NT_INC)/stdint.h NTLIB_H = $(LIB_SRC)/ntlib.h \ -- cgit v1.2.1