(Fcoordinates_in_window_p): Convert Fcons arguments to Lisp_Integer.

[gnu-emacs] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 9fcc0e7fdd8fca0f1334c2acfebbdd2ba8fea3fa..a4587e04ebe9fc0b4bf01c0fe0050346696816e5 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -144,6 +144,12 @@ CC = C_COMPILER
 #endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
 #endif /* LD_SWITCH_SYSTEM */
 
+/* This holds special options for linking temacs
+   that should be used for linking anything else.  */
+#ifndef LD_SWITCH_SYSTEM_TEMACS
+#define LD_SWITCH_SYSTEM_TEMACS
+#endif
+
 /* Some m/MACHINE.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
@@ -444,7 +450,8 @@ LD=ld
 #endif /* not COFF_ENCAPSULATE */
 #endif /* not ORDINARY_LINK */
 
-ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
+ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
+        LD_SWITCH_SITE $(LDFLAGS)
 
 /* A macro which other sections of Makefile can redefine to munge the
    flags before they're passed to LD.  This is helpful if you have
@@ -633,9 +640,10 @@ lisp= \
        ${lispsource}byte-run.elc \
        ${lispsource}cus-start.el \
        ${lispsource}custom.elc \
+       ${lispsource}emacs-lisp/lisp-mode.elc \
+       ${lispsource}emacs-lisp/lisp.elc \
        ${lispsource}faces.elc \
        ${lispsource}files.elc \
-       ${lispsource}fill.elc \
        ${lispsource}format.elc \
        FACE_SUPPORT \
        MOUSE_SUPPORT \
@@ -645,8 +653,6 @@ lisp= \
        ${lispsource}help.elc \
        ${lispsource}indent.elc \
        ${lispsource}isearch.elc \
-       ${lispsource}lisp-mode.elc \
-       ${lispsource}lisp.elc \
        ${lispsource}loadup.el \
        ${lispsource}loaddefs.el \
        ${lispsource}map-ynp.elc \
@@ -671,20 +677,22 @@ lisp= \
        ${lispsource}language/tibetan.elc \
        ${lispsource}language/vietnamese.elc \
        ${lispsource}language/misc-lang.elc \
-       ${lispsource}page.elc \
-       ${lispsource}paragraphs.elc \
        ${lispsource}paths.el \
        ${lispsource}register.elc \
        ${lispsource}replace.elc \
        ${lispsource}simple.elc \
        ${lispsource}startup.elc \
        ${lispsource}subr.elc \
-       ${lispsource}text-mode.elc \
+       ${lispsource}textmodes/fill.elc \
+       ${lispsource}textmodes/page.elc \
+       ${lispsource}textmodes/paragraphs.elc \
+       ${lispsource}textmodes/text-mode.elc \
        ${lispsource}vc-hooks.elc \
        ${lispsource}ediff-hook.elc \
        VMS_SUPPORT \
        MSDOS_SUPPORT \
        WINNT_SUPPORT \
+       ${lispsource}widget.elc \
        ${lispsource}window.elc \
        ${lispsource}version.el
 
@@ -698,22 +706,21 @@ shortlisp= \
        ../lisp/byte-run.elc \
        ../lisp/cus-start.el \
        ../lisp/custom.elc \
+       ../lisp/emacs-lisp/lisp-mode.elc \
+       ../lisp/emacs-lisp/lisp.elc \
        ../lisp/faces.elc \
        ../lisp/files.elc \
-       ../lisp/fill.elc \
        ../lisp/format.elc \
        ../lisp/help.elc \
        ../lisp/indent.elc \
        ../lisp/isearch.elc \
-       ../lisp/lisp-mode.elc \
-       ../lisp/lisp.elc \
        ../lisp/loadup.el \
        ../lisp/loaddefs.el \
        ../lisp/map-ynp.elc \
        ../lisp/international/mule.elc \
        ../lisp/international/mule-conf.el \
        ../lisp/international/mule-cmds.elc \
-       ../lisp/ainternational/characters.elc \
+       ../lisp/international/characters.elc \
        ../lisp/language/chinese.elc \
        ../lisp/language/cyrillic.elc \
        ../lisp/language/devanagari.elc \
@@ -730,17 +737,19 @@ shortlisp= \
        ../lisp/language/tibetan.elc \
        ../lisp/language/vietnamese.elc \
        ../lisp/language/misc-lang.elc \
-       ../lisp/page.elc \
-       ../lisp/paragraphs.elc \
        ../lisp/paths.el \
        ../lisp/register.elc \
        ../lisp/replace.elc \
        ../lisp/simple.elc \
        ../lisp/startup.elc \
        ../lisp/subr.elc \
-       ../lisp/text-mode.elc \
+       ../lisp/textmodes/fill.elc \
+       ../lisp/textmodes/page.elc \
+       ../lisp/textmodes/paragraphs.elc \
+       ../lisp/textmodes/text-mode.elc \
        ../lisp/vc-hooks.elc \
        ../lisp/ediff-hook.elc \
+       ../lisp/widget.elc \
        ../lisp/window.elc \
        ../lisp/version.el