From xemacs-m  Wed Sep 17 15:31:47 1997
Received: from mercury.Sun.COM (mercury.Sun.COM [192.9.25.1])
	by xemacs.org (8.8.5/8.8.5) with SMTP id PAA15921
	for <xemacs-beta@xemacs.org>; Wed, 17 Sep 1997 15:31:44 -0500 (CDT)
Received: from Eng.Sun.COM ([129.146.1.25]) by mercury.Sun.COM (SMI-8.6/mail.byaddr) with SMTP id NAA02398 for <xemacs-beta@xemacs.org>; Wed, 17 Sep 1997 13:31:09 -0700
Received: from kindra.eng.sun.com by Eng.Sun.COM (SMI-8.6/SMI-5.3)
	id NAA21437; Wed, 17 Sep 1997 13:30:17 -0700
Received: from xemacs.eng.sun.com by kindra.eng.sun.com (SMI-8.6/SMI-SVR4)
	id NAA27169; Wed, 17 Sep 1997 13:24:55 -0700
Received: by xemacs.eng.sun.com (SMI-8.6/SMI-SVR4)
	id NAA04702; Wed, 17 Sep 1997 13:24:56 -0700
Date: Wed, 17 Sep 1997 13:24:56 -0700
Message-Id: <199709172024.NAA04702@xemacs.eng.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Martin Buchholz <mrb@Eng.Sun.COM>
To: XEmacs Beta Test <xemacs-beta@xemacs.org>
Subject: PATCH: 19.16 Makefile comments
X-Mailer: VM 6.33 under 20.3 "Vienna" XEmacs  Lucid (beta14)
Reply-To: Martin Buchholz <mrb@Eng.Sun.COM>

To prevent CPP from complaining about our 19.16 Makefiles, we cannot
have comments starting with `#'.  They have to be C style comments.

In 20.3, this is handled differently, and Makefile comments have to
start with `##', which a sed script in configure knows about.

Also, we should avoid CPP warnings about /* in comments.

I'm continuing my bad habit of submitting completely untested patches, 
but I'm only changing comments here...
(there have been compiler bugs triggered by a comment change)


--- src/Makefile.in.in.orig	Wed Sep 17 13:15:43 1997
+++ src/Makefile.in.in	Wed Sep 17 13:16:44 1997
@@ -124,12 +124,10 @@
 #define LIBS_DEBUG -lg
 #endif
 
-/* 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
@@ -142,7 +140,6 @@
 # endif /* ! defined (LISP_FLOAT_TYPE) */
 #endif /* LIB_MATH */
 
-/* Some s/*.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_SYSTEM
 #if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)))
 #define LD_SWITCH_SYSTEM -X
@@ -159,22 +156,18 @@
 #define LD_SWITCH_SHARED -c
 #endif /* define a shared switch */
 
-/* Some m/*.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif
 
-/* Some m/*.h files define this to request special switches in cc.  */
 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
 
-/* Some s/*.h files define this to request special switches in cc.  */
 #ifndef C_SWITCH_SYSTEM
 #define C_SWITCH_SYSTEM
 #endif
 
-/* These macros are for switches specifically related to X Windows.  */
 #ifndef C_SWITCH_X_MACHINE
 #define C_SWITCH_X_MACHINE
 #endif
--- lib-src/Makefile.in.in.orig	Wed Sep 17 13:05:23 1997
+++ lib-src/Makefile.in.in	Wed Sep 17 13:14:27 1997
@@ -118,29 +118,28 @@
 SOURCES = COPYING ChangeLog Makefile.in.in README aixcc.lex emacs.csh \
 	makedoc.com *.[chy] $(SCRIPTS)
 
-# Additional -D flags for movemail (add to MOVE_FLAGS if desired):
-# MAIL_USE_POP		Support mail retrieval from a POP mailbox.
-# MAIL_USE_MMDF		Support MMDF mailboxes.
-# MAIL_USE_FLOCK	Use flock for file locking (see the comments
-#			about locking in movemail.c)
-# MAIL_UNLINK_SPOOL	Unlink the user spool mailbox after reading
-#			it (instead of just emptying it).
-# KERBEROS		Support Kerberized POP.
-# KRB5			Support Kerberos Version 5 pop instead of
-#			Version 4 (define this in addition to
-#			KERBEROS).
-# HESIOD		Support Hesiod lookups of user mailboxes.
-# MAILHOST		A string, the host name of the default POP
-#			mail host for the sit
+/* Additional -D flags for movemail (add to MOVE_FLAGS if desired): */
+/* MAIL_USE_POP		Support mail retrieval from a POP mailbox. */
+/* MAIL_USE_MMDF		Support MMDF mailboxes. */
+/* MAIL_USE_FLOCK	Use flock for file locking (see the comments */
+/*			about locking in movemail.c) */
+/* MAIL_UNLINK_SPOOL	Unlink the user spool mailbox after reading */
+/*			it (instead of just emptying it). */
+/* KERBEROS		Support Kerberized POP. */
+/* KRB5			Support Kerberos Version 5 pop instead of */
+/*			Version 4 (define this in addition to */
+/*			KERBEROS). */
+/* HESIOD		Support Hesiod lookups of user mailboxes. */
+/* MAILHOST		A string, the host name of the default POP */
+/*			mail host for the sit */
 
 MOVE_FLAGS=
-#
-# Additional libraries for movemail:
-# For KERBEROS
-# MOVE_LIBS= -lkrb -ldes -lcom_err
-# For KERBEROS + KRB5
-# MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err
-# Add "-lhesiod" if HESIOD is defined.
+/* Additional libraries for movemail: */
+/* For KERBEROS */
+/* MOVE_LIBS= -lkrb -ldes -lcom_err */
+/* For KERBEROS + KRB5 */
+/* MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err */
+/* Add "-lhesiod" if HESIOD is defined. */
 
 MOVE_LIBS=
 
@@ -182,12 +181,10 @@
 #undef alloca
 #endif
 
-/* 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

