From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Aug 2012 05:55:32 +0000 (+0300)
Subject: MS-Windows adaptations for 2012-08-25T04:04:08Z!eggert@cs.ucla.edu and 2012-08-25T04... 
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/391ceac53ab07bc081eecc5a5ab82a044d06edd1

MS-Windows adaptations for 2012-08-25T04:04:08Z!eggert@cs.ucla.edu and 2012-08-25T04:27:32Z!eggert@cs.ucla.edu.

 lib/makefile.w32-in ($(BLD)/execinfo.$(O), execinfo.h): New targets.
 (GNULIBOBJS): Add $(BLD)/execinfo.$(O).
 src/makefile.w32-in ($(BLD)/alloc.$(O)): Depend on $(GNU_LIB)/execinfo.h.
---

diff --git a/ChangeLog b/ChangeLog
index 8ffa630c16..cd14d49406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* lib/makefile.w32-in ($(BLD)/execinfo.$(O), execinfo.h): New targets.
+	(GNULIBOBJS): Add $(BLD)/execinfo.$(O).
+
 2012-08-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	On assertion failure, print backtrace if available.
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 11251d55f7..7df68fd330 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -28,6 +28,7 @@ GNULIBOBJS = $(BLD)/c-ctype.$(O) \
 	     $(BLD)/c-strncasecmp.$(O) \
 	     $(BLD)/dtoastr.$(O) \
 	     $(BLD)/dtotimespec.$(O)  \
+	     $(BLD)/execinfo.$(O)  \
 	     $(BLD)/getopt.$(O)  \
 	     $(BLD)/getopt1.$(O) \
 	     $(BLD)/gettime.$(O) \
@@ -129,6 +130,9 @@ $(BLD)/dtotimespec.$(O) : \
 	$(GNU_LIB)/timespec.h \
 	$(CONFIG_H)
 
+$(BLD)/execinfo.$(O) : \
+	$(GNU_LIB)/execinfo.h
+
 $(BLD)/getopt.$(O) : \
 	$(GNU_LIB)/getopt.c \
 	$(GNU_LIB)/getopt.h \
@@ -299,3 +303,7 @@ getopt_h:
 	      < getopt.in.h > getopt_.h-t
 	$(CP) getopt_.h-t getopt_.h
 	- $(DEL) getopt_.h-t
+
+execinfo.h: execinfo.in.h
+	$(CP) execinfo.in.h $@
+
diff --git a/src/ChangeLog b/src/ChangeLog
index fbaf555f8b..1a836543d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in ($(BLD)/alloc.$(O)): Depend on $(GNU_LIB)/execinfo.h.
+
 2012-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	On assertion failure, print backtrace if available.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index bdb292099b..e5959e0b1a 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -480,6 +480,7 @@ $(BLD)/alloc.$(O) : \
 	$(SRC)/syssignal.h \
 	$(SRC)/w32.h \
 	$(NT_INC)/unistd.h \
+	$(GNU_LIB)/execinfo.h \
 	$(GNU_LIB)/verify.h \
 	$(BLOCKINPUT_H) \
 	$(BUFFER_H) \