aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-09-27 00:04:10 +0200
committerJuanma Barranquero2012-09-27 00:04:10 +0200
commit6a586b7fe4088084022789bd0c122a47cd8ff1ac (patch)
tree9918450d8cb112c8a40c3435c3ee1cb54b571711 /lib-src
parent41c8bfcfbe028fc559a7eabc0dfe0c6fcafcb7cf (diff)
downloademacs-6a586b7fe4088084022789bd0c122a47cd8ff1ac.tar.gz
emacs-6a586b7fe4088084022789bd0c122a47cd8ff1ac.zip
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.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/makefile.w32-in2
2 files changed, 5 insertions, 1 deletions
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 @@
12012-09-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (obj): Add profiler.o.
4
12012-09-17 Glenn Morris <rgm@gnu.org> 52012-09-17 Glenn Morris <rgm@gnu.org>
2 6
3 * ebrowse.c (version): 7 * 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 \
140 process.o callproc.o unexw32.o \ 140 process.o callproc.o unexw32.o \
141 region-cache.o sound.o atimer.o \ 141 region-cache.o sound.o atimer.o \
142 doprnt.o intervals.o textprop.o composite.o \ 142 doprnt.o intervals.o textprop.o composite.o \
143 gnutls.o xml.o 143 gnutls.o xml.o profiler.o
144 144
145# 145#
146# These are the lisp files that are loaded up in loadup.el 146# These are the lisp files that are loaded up in loadup.el