* Makefile.in (LIBX): Link in tiff library before jpeg, since tiff library may

depend on jpeg.
(atimer.o): Depends on atimer.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2beecd27311d1ca06ab76caeda96464e491bad4d..6605d3b8aecb72c8825ead1312063e21926b3e30 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-11  Ken Raeburn  <raeburn@gnu.org>
+
+       * Makefile.in (LIBX): Link in tiff library before jpeg, since tiff
+       library may depend on jpeg.
+       (atimer.o): Depends on atimer.c.
+
 2000-02-11  Kenichi Handa  <handa@etl.go.jp>
 
        * insdel.c (del_range_1): Call update_compositions.

diff --git a/src/Makefile.in b/src/Makefile.in
index 90f9d2e84af7cf2caffa145603766f4785f4fc17..84317d1f28b65ff0568efb4e42d82492f7bdc994 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -420,7 +420,7 @@ LIBXT=
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBJPEG LIBPNG LIBTIFF LIBGIF
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBTIFF LIBJPEG LIBPNG LIBGIF
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
@@ -1146,7 +1146,7 @@ xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
 xrdb.o: xrdb.c $(config_h) epaths.h
 hftctl.o: hftctl.c $(config_h)
 sound.o: sound.c dispextern.h $(config_h)
-atimer.o: atimer.h systime.h $(config_h)
+atimer.o: atimer.c atimer.h systime.h $(config_h)
 
 /* The files of Lisp proper */