* ymakefile (C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH): Remove these;

	people shouldn't edit this file to choose optimization and
	debugging switches anyway.  ../configure will set CFLAGS to an
	appropriate default, which they will be able to override.
	* Makefile.in (xmakefile): Don't try to turn -g and -O in
	CFLAGS into C_DEBUG_SWITCH and C_OPTIMIZE_SWITCH.  CFLAGS should
	be the sole source of such switches, so that setting CFLAGS
	controls them completely.

diff --git a/src/Makefile.in b/src/Makefile.in
index 1cc94f6a73297384b71f7f1b890c476a00cf080f..4698ea1758bd62a2776e081f1e826e7a38e82ed2 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -76,10 +76,7 @@ relock:
 xmakefile: ymakefile config.h ../config.status
        -rm -f xmakefile xmakefile.new junk.c junk.cpp
        cp ${srcdir}/ymakefile junk.c
-       ${CPP} -I${srcdir} ${CFLAGS} junk.c > junk.cpp \
-       -DC_SWITCH_SITE="`echo ${CFLAGS}' ' \
-                         | sed -e 's/-g /C_DEBUG_SWITCH /' \
-                               -e 's/-O[0-9]* /C_OPTIMIZE_SWITCH /'`"
+       ${CPP} -I${srcdir} ${CFLAGS} junk.c > junk.cpp
        < junk.cpp                                      \
        sed     -e 's/^#.*//'                           \
                -e 's/^[ \f\t][ \f\t]*$$//'             \