From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 26 Sep 2012 22:04:10 +0000 (+0200)
Subject: Fix some profiler stuff on Windows (follow-up to 1995-03-15T21:55:37Z!kwzh@gnu.org).
X-Git-Tag: emacs-24.2.90~244^2~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a586b7fe4088084022789bd0c122a47cd8ff1ac;p=emacs.git

Fix some profiler stuff on Windows (follow-up to 1995-03-15T21:55:37Z!kwzh@gnu.org).

* lib-src/makefile.w32-in (obj): Add profiler.o.
* src/makefile.w32-in ($(BLD)/profiler.$(O)): Update dependencies.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f1e287db34..e46cddced4b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (obj): Add profiler.o.
+
 2012-09-17  Glenn Morris  <rgm@gnu.org>
 
 	* ebrowse.c (version):
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 64974b88b6f..23ef71de10c 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -140,7 +140,7 @@ obj =   dosfns.o msdos.o \
 	process.o callproc.o unexw32.o \
 	region-cache.o sound.o atimer.o \
 	doprnt.o intervals.o textprop.o composite.o \
-	gnutls.o xml.o
+	gnutls.o xml.o profiler.o
 
 #
 # These are the lisp files that are loaded up in loadup.el
diff --git a/src/ChangeLog b/src/ChangeLog
index 23d39a0de66..7a5192ad6bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in ($(BLD)/profiler.$(O)): Update dependencies.
+
 2012-09-26  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* character.h (MAYBE_UNIFY_CHAR): Remove.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 6f228ed0bb3..83e101d2c76 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -976,6 +976,7 @@ $(BLD)/xml.$(O) : \
 
 $(BLD)/profiler.$(O) : \
 	$(SRC)/profiler.c \
+	$(NT_INC)/sys/time.h \
 	$(CONFIG_H) \
 	$(LISP_H)