# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273125567 0
# Node ID fd99c025e8e3190e3b75b783c76ac6dc36666f1e
# Parent  b1e54ed5a91ee20fda3491eefe1d9daf8d567ef2# Parent  9ca2a7762d326417d14c6429bdf8f17c338a67b6
Merge from mainline.

diff -r b1e54ed5a91e -r fd99c025e8e3 src/Makefile.in
--- a/src/Makefile.in	Thu May 06 05:54:57 2010 +0000
+++ b/src/Makefile.in	Thu May 06 05:59:27 2010 +0000
@@ -802,14 +802,14 @@
 
 #ifndef AUTO_DEPEND
 
-## FIXME some of these dependencies are platform-specific.
-## Eg callproc.c only depends on w32.h for WINDOWSNT builds.
-## One way to fix this would be to replace w32.h (etc) by $(W32_H),
-## a variable set by configure.  Doesn't seem worth the trouble.
+/* FIXME some of these dependencies are platform-specific.
+Eg callproc.c only depends on w32.h for WINDOWSNT builds.
+One way to fix this would be to replace w32.h (etc) by $(W32_H),
+a variable set by configure.  Does not seem worth the trouble.
 
-## nsgui.h: In fact, every .o file depends directly or indirectly on
-## dispextern.h and hence nsgui.h under NS.  But the ones that actually
-## use stuff there are more limited.
+nsgui.h: In fact, every .o file depends directly or indirectly on
+dispextern.h and hence nsgui.h under NS.  But the ones that actually
+use stuff there are more limited.  */
 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \
  $(config_h)
 bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h $(config_h)