From 5ee95474c19e408d320b77585e1b2af76f6d4f93 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 31 Dec 2002 13:48:29 +0000 Subject: Revert SF patch 659809 -- it causes double options that can cause breakage. --- Makefile.pre.in | 6 +++--- Misc/NEWS | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index bf10d1c..2dde4af 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup # Compiler options OPT= @OPT@ -CFLAGS= $(OPT) @CFLAGS@ -CPPFLAGS= -I. -I$(srcdir)/Include @CPPFLAGS@ +CFLAGS= $(OPT) +CPPFLAGS= -I. -I$(srcdir)/Include LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ @@ -427,7 +427,7 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN) + $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ diff --git a/Misc/NEWS b/Misc/NEWS index b5345bf..edb4fc8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -764,9 +764,6 @@ Tools/Demos Build ----- -- Makefile.pre.in now adds @CFLAGS@ and @CPPFLAGS@ to their respective - variable definitions. - - On Unix, IDLE is now installed automatically. - The fpectl module is not built by default; it's dangerous or useless -- cgit v0.12