From 52331d2c41bf325fd1b22764fdc230d92b68ab85 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 9 Jul 2012 17:37:43 +0200 Subject: [PATCH] lib/makefile.w32-in: Rework dependencies. (GNU_LIB, NT_INC, C_CTYPE_H, MS_W32_H, CONFIG_H, FILEMODE_H) (FTOASTR_H, FTOASTR_C, GETOPT_INT_H, MD5_H, SHA1_H, SHA256_H) (U64_H, SHA512_H): New macros. (SRC): Redefine to point to src/, not current directory. ($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O)) ($(BLD)/c-strncasecmp.$(O), $(BLD)/dtoastr.$(O)) ($(BLD)/dtotimespec.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)) ($(BLD)/gettime.$(O), $(BLD)/strftime.$(O), $(BLD)/time_r.$(O)) ($(BLD)/timespec-add.$(O), $(BLD)/timespec-sub.$(O), $(BLD)/md5.$(O)) ($(BLD)/sha1.$(O), $(BLD)/sha256.$(O), $(BLD)/sha512.$(O)) ($(BLD)/filemode.$(O)): Update dependencies. --- ChangeLog | 15 ++++ lib/makefile.w32-in | 202 ++++++++++++++++++++++---------------------- 2 files changed, 114 insertions(+), 103 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05112149e03..bc6e1157c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2012-07-09 Juanma Barranquero + + * lib/makefile.w32-in: Rework dependencies. + (GNU_LIB, NT_INC, C_CTYPE_H, MS_W32_H, CONFIG_H, FILEMODE_H) + (FTOASTR_H, FTOASTR_C, GETOPT_INT_H, MD5_H, SHA1_H, SHA256_H) + (U64_H, SHA512_H): New macros. + (SRC): Redefine to point to src/, not current directory. + ($(BLD)/c-ctype.$(O), $(BLD)/c-strcasecmp.$(O)) + ($(BLD)/c-strncasecmp.$(O), $(BLD)/dtoastr.$(O)) + ($(BLD)/dtotimespec.$(O), $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)) + ($(BLD)/gettime.$(O), $(BLD)/strftime.$(O), $(BLD)/time_r.$(O)) + ($(BLD)/timespec-add.$(O), $(BLD)/timespec-sub.$(O), $(BLD)/md5.$(O)) + ($(BLD)/sha1.$(O), $(BLD)/sha256.$(O), $(BLD)/sha512.$(O)) + ($(BLD)/filemode.$(O)): Update dependencies. + 2012-07-09 Paul Eggert Merge from gnulib, incorporating: diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index f2853f10cb9..b49195bcb84 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -65,143 +65,139 @@ TAGS: FRC ### DEPENDENCIES ### EMACS_ROOT = .. -SRC = . +GNU_LIB = . +SRC = $(EMACS_ROOT)/src +NT_INC = $(EMACS_ROOT)/nt/inc + +C_CTYPE_H = $(GNU_LIB)/c-ctype.h \ + $(NT_INC)/stdbool.h +MS_W32_H = $(SRC)/s/ms-w32.h \ + $(NT_INC)/sys/stat.h +CONFIG_H = $(SRC)/config.h \ + $(MS_W32_H) +FILEMODE_H = $(GNU_LIB)/filemode.h \ + $(NT_INC)/sys/stat.h +FTOASTR_H = $(GNU_LIB)/ftoastr.h \ + $(GNU_LIB)/intprops.h +FTOASTR_C = $(GNU_LIB)/ftoastr.c \ + $(CONFIG_H) \ + $(FTOASTR_H) \ + $(GNU_LIB)/ftoastr.h +GETOPT_INT_H = $(GNU_LIB)/getopt_int.h \ + $(GNU_LIB)/getopt.h +MD5_H = $(GNU_LIB)/md5.h \ + $(NT_INC)/stdint.h +SHA1_H = $(GNU_LIB)/sha1.h \ + $(NT_INC)/stdint.h +SHA256_H = $(GNU_LIB)/sha256.h \ + $(NT_INC)/stdint.h +U64_H = $(GNU_LIB)/u64.h \ + $(NT_INC)/stdint.h +SHA512_H = $(GNU_LIB)/sha512.h \ + $(U64_H) \ + $(GNU_LIB)/u64.h $(BLD)/c-ctype.$(O) : \ - $(SRC)/c-ctype.c \ - $(SRC)/c-ctype.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/c-ctype.c \ + $(CONFIG_H) \ + $(C_CTYPE_H) $(BLD)/c-strcasecmp.$(O) : \ - $(SRC)/c-strcasecmp.c \ - $(SRC)/c-strcase.h \ - $(SRC)/c-ctype.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/c-strcasecmp.c \ + $(GNU_LIB)/c-strcase.h \ + $(CONFIG_H) \ + $(C_CTYPE_H) $(BLD)/c-strncasecmp.$(O) : \ - $(SRC)/c-strncasecmp.c \ - $(SRC)/c-strcase.h \ - $(SRC)/c-ctype.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/c-strncasecmp.c \ + $(GNU_LIB)/c-strcase.h \ + $(CONFIG_H) \ + $(C_CTYPE_H) $(BLD)/dtoastr.$(O) : \ - $(SRC)/dtoastr.c \ - $(SRC)/ftoastr.c \ - $(SRC)/ftoastr.h \ - $(SRC)/intprops.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/dtoastr.c \ + $(FTOASTR_C) $(BLD)/dtotimespec.$(O) : \ - $(SRC)/dtotimespec.c \ - $(SRC)/intprops.h \ - $(SRC)/timespec.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/dtotimespec.c \ + $(GNU_LIB)/intprops.h \ + $(GNU_LIB)/timespec.h \ + $(CONFIG_H) $(BLD)/getopt.$(O) : \ - $(SRC)/getopt.c \ - $(SRC)/getopt.h \ - $(SRC)/getopt_int.h \ - $(SRC)/gettext.h \ - $(EMACS_ROOT)/nt/inc/unistd.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/getopt.c \ + $(GNU_LIB)/getopt.h \ + $(GNU_LIB)/gettext.h \ + $(NT_INC)/unistd.h \ + $(CONFIG_H) \ + $(GETOPT_INT_H) $(BLD)/getopt1.$(O) : \ - $(SRC)/getopt1.c \ - $(SRC)/getopt.h \ - $(SRC)/getopt_int.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/getopt1.c \ + $(GNU_LIB)/getopt.h \ + $(CONFIG_H) \ + $(GETOPT_INT_H) $(BLD)/gettime.$(O) : \ - $(SRC)/gettime.c \ - $(SRC)/timespec.h \ - $(EMACS_ROOT)/nt/inc/sys/time.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/gettime.c \ + $(GNU_LIB)/timespec.h \ + $(NT_INC)/sys/time.h \ + $(CONFIG_H) $(BLD)/strftime.$(O) : \ - $(SRC)/strftime.c \ - $(SRC)/strftime.h \ - $(EMACS_ROOT)/nt/inc/stdbool.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/strftime.c \ + $(GNU_LIB)/strftime.h \ + $(NT_INC)/stdbool.h \ + $(CONFIG_H) $(BLD)/time_r.$(O) : \ - $(SRC)/time_r.c \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/time_r.c \ + $(CONFIG_H) $(BLD)/timespec-add.$(O) : \ - $(SRC)/timespec-add.c \ - $(SRC)/intprops.h \ - $(SRC)/timespec.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/timespec-add.c \ + $(GNU_LIB)/intprops.h \ + $(GNU_LIB)/timespec.h \ + $(CONFIG_H) $(BLD)/timespec-sub.$(O) : \ - $(SRC)/timespec-sub.c \ - $(SRC)/intprops.h \ - $(SRC)/timespec.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/timespec-sub.c \ + $(GNU_LIB)/intprops.h \ + $(GNU_LIB)/timespec.h \ + $(CONFIG_H) $(BLD)/md5.$(O) : \ - $(SRC)/md5.c \ - $(SRC)/md5.h \ - $(EMACS_ROOT)/nt/inc/stdint.h \ - $(EMACS_ROOT)/nt/inc/stdalign.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/md5.c \ + $(NT_INC)/stdalign.h \ + $(NT_INC)/stdint.h \ + $(CONFIG_H) \ + $(MD5_H) $(BLD)/sha1.$(O) : \ - $(SRC)/sha1.c \ - $(SRC)/sha1.h \ - $(EMACS_ROOT)/nt/inc/stdint.h \ - $(EMACS_ROOT)/nt/inc/stdalign.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/sha1.c \ + $(NT_INC)/stdalign.h \ + $(NT_INC)/stdint.h \ + $(CONFIG_H) \ + $(SHA1_H) $(BLD)/sha256.$(O) : \ - $(SRC)/sha256.c \ - $(SRC)/sha256.h \ - $(EMACS_ROOT)/nt/inc/stdint.h \ - $(EMACS_ROOT)/nt/inc/stdalign.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/sha256.c \ + $(NT_INC)/stdalign.h \ + $(NT_INC)/stdint.h \ + $(CONFIG_H) \ + $(SHA256_H) $(BLD)/sha512.$(O) : \ - $(SRC)/sha512.c \ - $(SRC)/sha512.h \ - $(EMACS_ROOT)/nt/inc/stdint.h \ - $(EMACS_ROOT)/nt/inc/stdalign.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/sha512.c \ + $(NT_INC)/stdalign.h \ + $(NT_INC)/stdint.h \ + $(CONFIG_H) \ + $(SHA512_H) $(BLD)/filemode.$(O) : \ - $(SRC)/filemode.c \ - $(SRC)/filemode.h \ - $(EMACS_ROOT)/nt/inc/sys/stat.h \ - $(EMACS_ROOT)/src/s/ms-w32.h \ - $(EMACS_ROOT)/src/config.h + $(GNU_LIB)/filemode.c \ + $(CONFIG_H) \ + $(FILEMODE_H) # The following dependencies are for supporting parallel builds, where # we must make sure $(BLD) exists before any compilation starts. -- 2.39.2