(EMACS_TIME_NEG_P): Cast to signed.

[bpt/emacs.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 3727fa2..4ed92ac 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 /* Makefile for GNU Emacs.
-   Copyright (C) 1985, 1987, 1988, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -289,7 +289,7 @@ LIBXMENU=
 #endif /* not HAVE_X_MENU */
 
 #ifdef USE_X_TOOLKIT
-LIBXT= -lXaw -lXt -lXmu
+LIBXT= -lXaw -lXt -lXmu -lXext
 #else
 LIBXT=
 #endif
@@ -486,6 +486,12 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 #define FRAME_SUPPORT
 #endif
 
+#ifdef HAVE_X_WINDOWS
+#define X_WINDOWS_SUPPORT
+#else
+#define X_WINDOWS_SUPPORT
+#endif
+
 #ifdef VMS
 #define VMS_SUPPORT ${lispdir}vmsproc.elc ${lispdir}vms-patch
 #else
@@ -498,11 +504,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 
    Note that this list should not include lisp files which might not
    be present, like site-load.el and site-init.el; this makefile
-   expects them all to be either present or buildable.
-
-   It should not include version.el.  That file is often changed by
-   the build process itself, but most of the files which want to
-   depend on lisp.h don't care about those changes.  */
+   expects them all to be either present or buildable.  */
 lisp= \
        ${lispdir}abbrev.elc \
        ${lispdir}buff-menu.elc \
@@ -512,6 +514,7 @@ lisp= \
        ${lispdir}fill.elc \
        FLOAT_SUPPORT \
        FRAME_SUPPORT \
+       X_WINDOWS_SUPPORT \
        ${lispdir}help.elc \
        ${lispdir}indent.elc \
        ${lispdir}isearch.elc \
@@ -530,7 +533,8 @@ lisp= \
        ${lispdir}text-mode.elc \
        ${lispdir}vc-hooks.elc \
        VMS_SUPPORT \
-       ${lispdir}window.elc
+       ${lispdir}window.elc \
+       ${lispdir}version.el
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -558,6 +562,7 @@ all: emacs OTHER_FILES
 
 emacs: temacs ${etc}DOC ${lisp}
 #ifdef CANNOT_DUMP
+       rm -f emacs
        ln temacs emacs
 #else
 #ifdef HAVE_SHM
@@ -855,7 +860,7 @@ unlock:
 relock:
        chmod -w $(SOURCES)
        chmod +w paths.h
-tagsfiles = [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../lisp/term/[a-z]*.el
+tagsfiles = [a-zA-Z]*.h [a-zA-Z]*.c ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el
 TAGS: $(tagsfiles)
        etags $(tagsfiles)
 tags: TAGS