Adjust for autoconf merger.

	* config.h.in: Add extra line to top, in case autoconf gets fixed
	and decides not to add Makefile-style comments to the top of the
	files it generates which we are forced to lop off.
	Indicate that the boolean macros here get their definitions via
	the DEFS Makefile variable.
	Adjust the operating system and machine #includes to use
	autoload's @cookies@.
	(RETSIGTYPE): Give this a default value.
	(SIGTYPE): Set this from RETSIGTYPE.
	(LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Get values via @cookies@.
	* Makefile.in (DEFS): Renamed from CONFIG_CFLAGS.
	(xmakefile): Pass CFLAGS to ${CPP}.

	* Makefile.in (tagsfiles): Remove external-lisp from this list of
	files; we're not distributing it, so the normal build process
	shouldn't depend on it.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 7ab05dba58..2c7fad192e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,7 +8,7 @@ MAKE = make
 # ==================== Things `configure' might edit ====================
 
 CC=cc
-CONFIG_CFLAGS=-g
+DEFS=-g
 srcdir=.
 
 # ============================= Targets ==============================
@@ -19,7 +19,7 @@ CPP = $(CC) -E -Is -Im
 # Just to avoid uncertainty.
 SHELL = /bin/sh
 
-CFLAGS=${CONFIG_CFLAGS}
+CFLAGS=${DEFS}
 
 all: doall
 
@@ -72,7 +72,7 @@ relock:
 xmakefile: ymakefile config.h
 	-rm -f xmakefile xmakefile.new junk.c junk.cpp
 	cp ymakefile junk.c
-	$(CPP) junk.c > junk.cpp \
+	${CPP} ${CFLAGS} junk.c > junk.cpp \
 	-DC_SWITCH_SITE="`echo ${CFLAGS}' ' \
 			  | sed -e 's/-g /C_DEBUG_SWITCH /' \
 				-e 's/-O /C_OPTIMIZE_SWITCH /'`"
@@ -86,8 +86,7 @@ xmakefile: ymakefile config.h
 	chmod 444 xmakefile
 	rm -f junk.c junk.cpp
 
-tagsfiles = [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../lisp/term/[a-z]*.el \
-	    ../external-lisp/*.el
+tagsfiles = [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../lisp/term/[a-z]*.el
 TAGS: $(tagsfiles)
 	etags $(tagsfiles)
 tags: TAGS