diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-12 15:01:33 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-12 15:01:33 (GMT) |
| commit | 32fbe599784f80f08e7ecd4ebdde158797f0a5ff (patch) | |
| tree | 9bdb01f6a4f303c0294fd4dbce7ee0d878fcfb32 /Makefile.pre.in | |
| parent | 96f31636f4af949dd0975c9381d284915c9d76f6 (diff) | |
| download | cpython-32fbe599784f80f08e7ecd4ebdde158797f0a5ff.zip cpython-32fbe599784f80f08e7ecd4ebdde158797f0a5ff.tar.gz cpython-32fbe599784f80f08e7ecd4ebdde158797f0a5ff.tar.bz2 | |
Merged revisions 58939-58946 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58940 | martin.v.loewis | 2007-11-12 05:53:02 +0100 (Mon, 12 Nov 2007) | 3 lines
Only set rl_completion_display_matches_hook if there
is a Python hook function. Fixes #1425.
........
r58941 | martin.v.loewis | 2007-11-12 06:14:05 +0100 (Mon, 12 Nov 2007) | 2 lines
Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.
........
r58942 | walter.doerwald | 2007-11-12 11:01:33 +0100 (Mon, 12 Nov 2007) | 2 lines
Fix TextCalendar.prweek(). This closes issue #1427.
........
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index c604fca..2277a22 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -169,6 +169,8 @@ THREADOBJ= @THREADOBJ@ DLINCLDIR= @DLINCLDIR@ DYNLOADFILE= @DYNLOADFILE@ MACHDEP_OBJS= @MACHDEP_OBJS@ +LIBOBJDIR= Python/ +LIBOBJS= @LIBOBJS@ UNICODE_OBJS= @UNICODE_OBJS@ PYTHON= python$(EXE) @@ -276,6 +278,7 @@ PYTHON_OBJS= \ Python/pystrtod.o \ Python/formatter_unicode.o \ Python/$(DYNLOADFILE) \ + $(LIBOBJS) \ $(MACHDEP_OBJS) \ $(THREADOBJ) |