diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
| commit | a977329b6fb0e4c95cabb9043794de69b27a1099 (patch) | |
| tree | b91552a0578639bd10181ab612039c1bed9bec27 /Makefile.pre.in | |
| parent | d858f70617a9df8456e89a898ad8f97bd57c09f9 (diff) | |
| download | cpython-git-a977329b6fb0e4c95cabb9043794de69b27a1099.tar.gz | |
Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 5f2e98408f..056b57803a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -974,6 +974,8 @@ clean: find . -name '*.o' -exec rm -f {} ';' find . -name '*.s[ol]' -exec rm -f {} ';' find $(srcdir) -name '*.py[co]' -exec rm -f {} ';' + find $(srcdir) -name 'fficonfig.h' -exec rm -f {} ';' + find $(srcdir) -name 'fficonfig.py' -exec rm -f {} ';' clobber: clean -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \ |