Mercurial > emacs
changeset 27665:105b01b90125
* Makefile.in (LIBX): Link in tiff library before jpeg, since tiff library may
depend on jpeg.
(atimer.o): Depends on atimer.c.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Fri, 11 Feb 2000 06:04:09 +0000 |
| parents | c5c27d509bdf |
| children | fb8f59c1319c |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Fri Feb 11 02:20:49 2000 +0000 +++ b/src/Makefile.in Fri Feb 11 06:04:09 2000 +0000 @@ -420,7 +420,7 @@ /* 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 @@ 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 */