* Makefile.in (DEFS): Remove this; we have configure build a

	config.h file directly, instead of having lots of -D flags.

	* Makefile.in (CFLAGS): Don't make this carry DEFS from the
	configure script; the coding standards say that CFLAGS should be
	left for the user to tweak.

	* Makefile.in (LN_S): New variable, edited by top Makefile.
	(SUBMAKEFILE): New variable, containing all flags to pass to
	recursive makes.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 5f0afca50c3..70cad233587 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,8 +8,9 @@ MAKE = make
 # ==================== Things `configure' might edit ====================
 
 CC=cc
-DEFS=-g
+CFLAGS=-g
 srcdir=.
+LN_S=ln -s
 
 # ============================= Targets ==============================
 
@@ -19,12 +20,12 @@ CPP = $(CC) -E -Is -Im
 # Just to avoid uncertainty.
 SHELL = /bin/sh
 
-CFLAGS=${DEFS}
+SUBMAKEFLAGS = CC='${CC}' LN_S='${LN_S}'
 
 all: doall
 
 doall: xmakefile
-        $(MAKE) CC='${CC}' -f xmakefile ${MFLAGS} all
+        $(MAKE) ${SUBMAKEFLAGS} -f xmakefile ${MFLAGS} all
 
 #This is used in making a distribution.
 #Do not use it on development directories!
@@ -44,13 +45,13 @@ emacs: doemacs
         @true
 
 doemacs: xmakefile
-        $(MAKE) CC='${CC}' -f xmakefile ${MFLAGS} emacs
+        $(MAKE) ${SUBMAKEFLAGS} -f xmakefile ${MFLAGS} emacs
 
 temacs: dotemacs
         @true
 
 dotemacs: xmakefile
-        $(MAKE) CC='${CC}' -f xmakefile ${MFLAGS} temacs
+        $(MAKE) ${SUBMAKEFLAGS} -f xmakefile ${MFLAGS} temacs
 
 SOURCES = *.[ch] [sm]/* COPYING Makefile.in ymakefile \
         config.h.in README COPYING ChangeLog vms.pp-trans