Put in a separator for where to start cpp procssing.

Move all autoconf substitutions above that point.
Above that point, use Make-style comments.
This goes with changes in ../configure.in.

1 files changed, 95 insertions, 90 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 0db8313d41d..04da652063b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,136 +1,99 @@
-/* Makefile for lib-src subdirectory in GNU Emacs.
-   Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
+# Makefile for lib-src subdirectory in GNU Emacs.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GNU Emacs.
+# This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#define NO_SHORTNAMES
-#define THIS_IS_YMAKEFILE
-#define NOT_C_CODE
-#include "../src/config.h"
-
-/* Some s/*.h files define this to request special libraries.  */
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-
-/* Some m/*.h files define this to request special libraries.  */
-#ifndef LIBS_MACHINE
-#define LIBS_MACHINE
-#endif
-
-#ifndef C_SWITCH_SYSTEM
-#define C_SWITCH_SYSTEM
-#endif
-
-#ifndef C_SWITCH_MACHINE
-#define C_SWITCH_MACHINE
-#endif
-
-#undef MOVEMAIL_NEEDS_BLESSING
-#ifndef MAIL_USE_FLOCK
-#ifndef MAIL_USE_LOCKF
-#define MOVEMAIL_NEEDS_BLESSING
-#endif
-#endif
-
-#ifdef MOVEMAIL_NEEDS_BLESSING
-#define BLESSMAIL blessmail
-#else
-#define BLESSMAIL
-#endif
-
-/* Avoid trouble on systems where the `SHELL' variable might be
-   inherited from the environment.  */
+# Avoid trouble on systems where the `SHELL' variable might be
+# inherited from the environment.
 SHELL = /bin/sh
 
-/* ==================== Things `configure' will edit ==================== */
+# ==================== Things `configure' will edit ====================
 
 CC=@CC@
 CFLAGS=@CFLAGS@
 ALLOCA=@ALLOCA@
-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
 YACC=@YACC@
 version=@version@
 configuration=@configuration@
 
-/* ==================== Where To Install Things ==================== */
+# ==================== Where To Install Things ====================
 
-/* The default location for installation.  Everything is placed in
-   subdirectories of this directory.  The default values for many of
-   the variables below are expressed in terms of this one, so you may
-   not need to change them.  This is set with the --prefix option to
-   `../configure'.  */
+# The default location for installation.  Everything is placed in
+# subdirectories of this directory.  The default values for many of
+# the variables below are expressed in terms of this one, so you may
+# not need to change them.  This is set with the --prefix option to
+# `../configure'.
 prefix=@prefix@
 
-/* Like `prefix', but used for architecture-specific files.  This is
-   set with the --exec-prefix option to `../configure'.  */
+# Like `prefix', but used for architecture-specific files.  This is
+# set with the --exec-prefix option to `../configure'.
 exec_prefix=@exec_prefix@
 
-/* Where to install Emacs and other binaries that people will want to
-   run directly (like etags).  This is set with the --bindir option
-   to `../configure'.  */
+# Where to install Emacs and other binaries that people will want to
+# run directly (like etags).  This is set with the --bindir option
+# to `../configure'.
 bindir=@bindir@
 
-/* Where to install and expect executable files to be run by Emacs
-   rather than directly by users, and other architecture-dependent
-   data.  ${archlibdir} is usually below this.  This is set with the
-   --libdir option to `../configure'.  */
+# Where to install and expect executable files to be run by Emacs
+# rather than directly by users, and other architecture-dependent
+# data.  ${archlibdir} is usually below this.  This is set with the
+# --libdir option to `../configure'.
 libdir=@libdir@
 
-/* Where to find the source code.  This is set by the configure
-   script's `--srcdir' option.  However, the value of ${srcdir} in
-   this makefile is not identical to what was specified with --srcdir,
-   since the variable here has `/lib-src' added at the end.  */
+# Where to find the source code.  This is set by the configure
+# script's `--srcdir' option.  However, the value of ${srcdir} in
+# this makefile is not identical to what was specified with --srcdir,
+# since the variable here has `/lib-src' added at the end.
 srcdir=@srcdir@
 VPATH=@srcdir@
 
-/* ==================== Emacs-specific directories ==================== */
+# ==================== Emacs-specific directories ====================
 
-/* These variables hold the values Emacs will actually use.  They are
-   based on the values of the standard Make variables above.  */
+# These variables hold the values Emacs will actually use.  They are
+# based on the values of the standard Make variables above.
 
-/* Where to put executables to be run by Emacs rather than the user.
-   This path usually includes the Emacs version and configuration name,
-   so that multiple configurations for multiple versions of Emacs may
-   be installed at once.  This can be set with the --archlibdir option
-   to `../configure'.  */
+# Where to put executables to be run by Emacs rather than the user.
+# This path usually includes the Emacs version and configuration name,
+# so that multiple configurations for multiple versions of Emacs may
+# be installed at once.  This can be set with the --archlibdir option
+# to `../configure'.
 archlibdir=@archlibdir@
 
-/* ==================== Utility Programs for the Build ================= */
+# ==================== Utility Programs for the Build =================
 
-/* ../configure figures out the correct values for these.  */
+# ../configure figures out the correct values for these.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-/* ============================= Targets ============================== */
+# ========================== Lists of Files ===========================
 
-/* Things that a user might actually run,
-   which should be installed in bindir.  */
+# Things that a user might actually run,
+# which should be installed in bindir.
 INSTALLABLES = etags ctags emacsclient b2m
 INSTALLABLE_SCRIPTS = rcs-checkin
 
-/* Things that Emacs runs internally, or during the build process,
-   which should not be installed in bindir.  */
+# Things that Emacs runs internally, or during the build process,
+#  which should not be installed in bindir.
 UTILITIES= test-distrib make-path wakeup profile make-docfile digest-doc \
         sorted-doc movemail cvtmail fakemail yow emacsserver hexl timer
 
-/* Like UTILITIES, but they're not system-dependent, and should not be
-   deleted by the distclean target.  */
+# Like UTILITIES, but they're not system-dependent, and should not be
+#  deleted by the distclean target.
 SCRIPTS= rcs2log vcdiff
 
 EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
@@ -138,6 +101,47 @@ EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 SOURCES = COPYING ChangeLog Makefile.in README aixcc.lex emacs.csh \
         makedoc.com *.[chy] rcs2log vcdiff
 
+# ========================== start of cpp stuff =======================
+/* From here on, comments must be done in C syntax.  */
+
+#define NO_SHORTNAMES
+#define THIS_IS_YMAKEFILE
+#define NOT_C_CODE
+#include "../src/config.h"
+
+/* Some s/*.h files define this to request special libraries.  */
+#ifndef LIBS_SYSTEM
+#define LIBS_SYSTEM
+#endif
+
+/* Some m/*.h files define this to request special libraries.  */
+#ifndef LIBS_MACHINE
+#define LIBS_MACHINE
+#endif
+
+#ifndef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM
+#endif
+
+#ifndef C_SWITCH_MACHINE
+#define C_SWITCH_MACHINE
+#endif
+
+#undef MOVEMAIL_NEEDS_BLESSING
+#ifndef MAIL_USE_FLOCK
+#ifndef MAIL_USE_LOCKF
+#define MOVEMAIL_NEEDS_BLESSING
+#endif
+#endif
+
+#ifdef MOVEMAIL_NEEDS_BLESSING
+#define BLESSMAIL blessmail
+#else
+#define BLESSMAIL
+#endif
+
+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
+
 /* We need to #define emacs to get the right versions of some files.
    Some other files - those shared with other GNU utilities - need
    HAVE_CONFIG_H #defined before they know they can take advantage of
@@ -173,6 +177,7 @@ maybe-blessmail: BLESSMAIL
           echo Assuming $$dir is really the mail spool directory, you should; \
           echo run  ./blessmail ${archlibdir}/movemail; \
           echo as root, to give  movemail  appropriate permissions.; \
+          echo Do that after running  make install.; \
         fi
 #endif