* Makefile.in (distclean): Don't delete machine.h or system.h;

	they don't exist anymore.

	* Makefile.in (distclean): Don't delete autosave or backup files.
	(extraclean): New target; like distclean, but delete autosave
	and backup files too.

	* Makefile.in (srcdir): New variable, not fully implemented.
	(xmakefile): Turn -g and -O in CFLAGS into C_DEBUG_SWITCH and
	C_OPTIMIZE_SWITCH in C_SWITCH_SITE's definition.  Delete junk.cpp
	when done.
	* ymakefile (archlib): Variable definition deleted.  Run programs
	from ../lib-src directly, or use ${archlibdir}.
	(${etc}DOC): Run make-docfile from ${libsrc}, not ${archlib}.
	(${archlib}make-docfile, ${archlib}emacstool): Use ${libsrc}, not
	${archlib}.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 79994082791..606e0630b9b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -5,9 +5,13 @@
 MAKE = make
 # BSD doesn't have it as a default.
 
-# These values are edited by configure.
+# ==================== Things `configure' might edit ====================
+
 CC=cc
-CFLAGS=-g
+CONFIG_CFLAGS=-g
+srcdir=.
+
+# ============================= Targets ==============================
 
 CPP = $(CC) -E -Is -Im
 #Note: an alternative is  CPP = /lib/cpp
@@ -15,6 +19,8 @@ CPP = $(CC) -E -Is -Im
 # Just to avoid uncertainty.
 SHELL = /bin/sh
 
+CFLAGS=${CONFIG_CFLAGS}
+
 all: doall
 
 doall: xmakefile
@@ -23,11 +29,14 @@ doall: xmakefile
 #This is used in making a distribution.
 #Do not use it on development directories!
 distclean:
-        -rm -f paths.h config.h machine.h system.h emacs-* temacs xemacs xmakefile core *~ m/*~ s/*~ \#* *.o
+        -rm -f paths.h config.h emacs-* temacs xemacs xmakefile core *.o
 
 clean:
         -rm -f temacs xemacs prefix-args xmakefile* core \#* *.o
 
+extraclean: distclean
+        -rm -f *~ \#* m/*~ s/*~
+
 xemacs: doxemacs
 
 doxemacs: xmakefile
@@ -57,6 +66,7 @@ xmakefile: ymakefile config.h
         | sed -n -e '/^..*$$/p'                         \
         > xmakefile.new
         mv -f xmakefile.new xmakefile
+        chmod 444 xmakefile
         rm -f junk.c junk.cpp
 
 tags TAGS: