1--- clisp-conversion2/src/makemake.in	Sat Feb 15 17:51:44 2003
2+++ clisp-conversion/src/makemake.in	Sat Feb 15 12:58:42 2003
3@@ -1962,7 +1962,6 @@
4   echol "SHELL = /bin/sh"
5   echol
6 fi
7-echol "COMMENT5 = ${HERE}comment5"
8
9 if [ -n "$XCC_SUNPRO" ] ; then
10   XASM_NEED_CCPAUX=true
11@@ -2099,7 +2098,6 @@
12 if [ $NEED_CCPAUX = true ] ; then
13   UTILS=$UTILS' ccpaux'
14 fi
15-UTILS=$UTILS' comment5'
16 UTILS=$UTILS' ansidecl'
17 UTILS=$UTILS' varbrace'
18 if [ $XCC_NEED_DEEMA = true -a $HOS != unix ] ; then
19@@ -2188,40 +2186,18 @@
20     echotab_to_HEXE "\$(CC) \$(CFLAGS) \$(CLFLAGS)" "${SRCTOPDIR}os2/${util}.c" "${util}"
21     echol
22   fi
23-  if [ $util = comment5 ] ; then
24-    if [ $CC_NEED_CCPAUX = true ] ; then
25-      echol "${util}${HEXE} : ${UTILDIR_M}${util}.c ${CCPAUX}"
26-      echotab "${HERE}ccpaux${HEXE} < ${UTILDIR_}${util}.c > ${util}.c"
27-      echotab_to_HEXE "\$(CC) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}"
28-      echotab "\$(RM) ${util}.c"
29-      echol
30-      OBSOLETE=$OBSOLETE" ${util}.c"
31-    else
32-      echol "${util}${HEXE} : ${UTILDIR_M}${util}.c"
33-      if [ ${HSYS} = "win32gcc" ]; then
34-        # **HACK**: avoid -mno-cygwin so that comment5.exe
35-        #           understands symbolic links
36-        echotab_to_HEXE "gcc \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}"
37-      else
38-        echotab_to_HEXE "\$(CC) \$(CFLAGS) \$(CLFLAGS)" "${UTILDIR_CC}${util}.c" "${util}"
39-      fi
40-      echol
41-    fi
42-  fi
43   if [ $util = ansidecl ] ; then
44     flags="${ANSIDECLFLAGS}"
45-    echol "${util}${HEXE} : ${UTILDIR_M}${util}.d comment5${HEXE}"
46-    echotab "\$(LN_S) ${UTILDIR_}${util}.d ${util}.d"
47-    echotab "\$(COMMENT5) ${util}.d ${util}.c"
48-    echotab "\$(RM) ${util}.d"
49+    echol "${util}${HEXE} : ${UTILDIR_M}${util}.d"
50+    echotab "\$(LN_S) ${UTILDIR_}${util}.d ${util}.c"
51     echotab_to_HEXE "\$(CC) \$(CFLAGS) \$(CLFLAGS)${flags}" "${util}.c" "${util}"
52     echotab "\$(RM) ${util}.c"
53     echol
54     OBSOLETE=$OBSOLETE" ${util}.c"
55   fi
56   if [ $util = varbrace ] ; then
57-    echol "${util}${HEXE} : ${UTILDIR_M}${util}.d comment5${HEXE} ansidecl${HEXE}"
58-    echotabpipe "\$(COMMENT5) ${UTILDIR_CC}${util}.d | \$(ANSIDECL) > ${util}.c"
59+    echol "${util}${HEXE} : ${UTILDIR_M}${util}.d ansidecl${HEXE}"
60+    echotabpipe "\$(CAT) ${UTILDIR_CC}${util}.d | \$(ANSIDECL) > ${util}.c"
61     echotab_to_HEXE "\$(CC) \$(CFLAGS) \$(CLFLAGS)" "${util}.c" "${util}"
62     echotab "\$(RM) ${util}.c"
63     echol
64@@ -2281,14 +2257,14 @@
65 echol
66
67 for f in $DFILES ; do
68-  echol "${f}.c : ${f}.d comment5${HEXE}${XDECL_DEPENDENCIES}"
69-  echotabpipe "\$(COMMENT5) ${f}.d${CHSCONVERT_FILTER} ${XDECL_FILTER} > ${f}.c"
70+  echol "${f}.c : ${f}.d ${XDECL_DEPENDENCIES}"
71+  echotabpipe "\$(CAT) ${f}.d${CHSCONVERT_FILTER} ${XDECL_FILTER} > ${f}.c"
72   echol
73 done
74
75 for f in $ARI_ASMD $SP_ASMD ; do
76-  echol "${f}.c : ${f}.d comment5${HEXE} ${XCCPAUX}"
77-  echotabpipe "\$(COMMENT5) ${f}.d${XASMCCPAUX_FILTER} > ${f}.c"
78+  echol "${f}.c : ${f}.d ${XCCPAUX}"
79+  echotabpipe "\$(CAT) ${f}.d${XASMCCPAUX_FILTER} > ${f}.c"
80   echol
81 done
82
83@@ -3618,7 +3594,7 @@
84   echotab "-\$(RM) MAGIC.add"
85 fi
86 echotab "-\$(RMRF) data"
87-echotab "-\$(RM) comment5${HEXE} ansidecl${HEXE} varbrace${HEXE} ccpaux${HEXE} deema${HEXE} txt2c${HEXE} ccmp2c${HEXE} modprep${HEXE} clisp${HEXE}"
88+echotab "-\$(RM) ansidecl${HEXE} varbrace${HEXE} ccpaux${HEXE} deema${HEXE} txt2c${HEXE} ccmp2c${HEXE} modprep${HEXE} clisp${HEXE}"
89 echol
90 cat <<!!
91 # clean6 lets us go back to "makemake > Makefile".
92--- clisp-conversion2/src/lispbibl.d	Sat Feb 15 18:03:58 2003
93+++ clisp-conversion/src/lispbibl.d	Sat Feb 15 18:10:20 2003
94@@ -84,7 +84,7 @@
95 # Acorn        Risc PC            RISC OS 3.x                   GNU           [__]arm, [__]riscos, __GNUC__
96 # Acorn        Risc PC            RISC OS 3.x                   Norcroft      [__]arm, [__]riscos
97 # APPLE IIGS   Apple              ??                            ??
98-# For ANSI-C-Compiler: use pre-processors comment5, ansidecl
99+# For ANSI-C-Compiler: use pre-processors ansidecl
100 #   (and maybe gcc-cpp, ccpaux).
101
102
103--- clisp-conversion2/utils/ccmp2c.c	Mon Dec  2 06:22:30 2002
104+++ clisp-conversion/utils/ccmp2c.c	Sat Feb 15 16:41:19 2003
105@@ -58,8 +58,6 @@
106 #define MAXARGCOUNT        50
107 /* define as 1 if C++ style comments "//" shall be understood */
108 #define CPLUSPLUS_COMMENTS 1
109-/* define as 1 if comment5 style comments "# " shall be understood */
110-#define COMMENT5_COMMENTS  1
111 /* functions are split after this many statements */
112 #define MAXFUNCLENGTH  20
113
114@@ -368,14 +366,6 @@
115         if (within_prep_directive)
116           goto separator;
117         else
118-#if COMMENT5_COMMENTS
119-          if (peek_char(infile) == ' ') {
120-            next_char(infile);
121-            do { c = next_char(infile); }
122-            while (c!=EOF && c!='\n');
123-            goto restart;
124-          } else
125-#endif
126             {
127               while(1) {
128                 token_t* subtoken = nexttoken(infile,tokens,FALSE,TRUE);
129