From 05aba6ce39160c487cb41e474bbe306839c340a9 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 6 Jan 2013 21:36:21 +0200 Subject: [PATCH] Issue #16320: Remove redundant Makefile dependencies for strings and bytes. --- Makefile.pre.in | 21 ++++++++++----------- Misc/NEWS | 2 ++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 54755b914a8..97bb005aac1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -689,28 +689,30 @@ Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ $(srcdir)/Objects/unicodetype_db.h BYTESTR_DEPS = \ - $(srcdir)/Include/bytes_methods.h \ $(srcdir)/Objects/stringlib/count.h \ $(srcdir)/Objects/stringlib/ctype.h \ - $(srcdir)/Objects/stringlib/eq.h \ $(srcdir)/Objects/stringlib/fastsearch.h \ $(srcdir)/Objects/stringlib/find.h \ - $(srcdir)/Objects/stringlib/find_max_char.h \ $(srcdir)/Objects/stringlib/join.h \ $(srcdir)/Objects/stringlib/partition.h \ $(srcdir)/Objects/stringlib/split.h \ $(srcdir)/Objects/stringlib/stringdefs.h \ - $(srcdir)/Objects/stringlib/transmogrify.h \ - $(srcdir)/Objects/stringlib/unicodedefs.h \ - $(srcdir)/Objects/stringlib/localeutil.h \ - $(srcdir)/Objects/stringlib/undef.h + $(srcdir)/Objects/stringlib/transmogrify.h -UNICODE_DEPS = $(BYTESTR_DEPS) \ +UNICODE_DEPS = \ $(srcdir)/Objects/stringlib/asciilib.h \ $(srcdir)/Objects/stringlib/codecs.h \ + $(srcdir)/Objects/stringlib/count.h \ + $(srcdir)/Objects/stringlib/fastsearch.h \ + $(srcdir)/Objects/stringlib/find.h \ + $(srcdir)/Objects/stringlib/find_max_char.h \ + $(srcdir)/Objects/stringlib/localeutil.h \ + $(srcdir)/Objects/stringlib/partition.h \ + $(srcdir)/Objects/stringlib/split.h \ $(srcdir)/Objects/stringlib/ucs1lib.h \ $(srcdir)/Objects/stringlib/ucs2lib.h \ $(srcdir)/Objects/stringlib/ucs4lib.h \ + $(srcdir)/Objects/stringlib/undef.h \ $(srcdir)/Objects/stringlib/unicode_format.h \ $(srcdir)/Objects/stringlib/unicodedefs.h @@ -728,9 +730,6 @@ $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES) Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h -Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \ - $(BYTESTR_DEPS) - Python/frozen.o: Python/importlib.h Objects/typeobject.o: Objects/typeslots.inc diff --git a/Misc/NEWS b/Misc/NEWS index 14e021717b2..53e5cbac010 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -633,6 +633,8 @@ Tests Build ----- +- Issue #16320: Remove redundant Makefile dependencies for strings and bytes. + - Cross compiling needs host and build settings. configure no longer creates a broken PYTHON_FOR_BUILD variable when --build is missing.