summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2008-06-10 21:23:22 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2008-06-10 21:23:22 (GMT)
commitb7fea62ccaf10364047e8fc39005fafec7ad5975 (patch)
treec039f1bc27af755829426c09090b6995e5b5904a /Makefile.pre.in
parent482f31299c3512a2033c48c92ae1d055c038824c (diff)
downloadcpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.zip
cpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.tar.gz
cpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.tar.bz2
Rename bytesobject.c back to stringobject.c to keep with the PyString theme.
Part of reverting most of r63675 per the mailing list discussion.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 94e937c..c7b72f5 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -303,7 +303,6 @@ OBJECT_OBJS= \
Objects/bufferobject.o \
Objects/bytes_methods.o \
Objects/bytearrayobject.o \
- Objects/bytesobject.o \
Objects/cellobject.o \
Objects/classobject.o \
Objects/cobject.o \
@@ -327,8 +326,9 @@ OBJECT_OBJS= \
Objects/object.o \
Objects/obmalloc.o \
Objects/rangeobject.o \
- Objects/setobject.o \
+ Objects/setobject.o \
Objects/sliceobject.o \
+ Objects/stringobject.o \
Objects/structseq.o \
Objects/tupleobject.o \
Objects/typeobject.o \
@@ -563,8 +563,6 @@ Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
$(STRINGLIB_HEADERS)
-Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c \
- $(STRINGLIB_HEADERS)
Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
$(STRINGLIB_HEADERS)