[Stackless-checkins] CVS: slpdev/src/2.2/src Makefile.pre.in, 1.19, 1.20
Christian Tismer
tismer at centera.de
Tue May 4 17:40:22 CEST 2004
Update of /home/cvs/slpdev/src/2.2/src
In directory centera.de:/tmp/cvs-serv30936/src/2.2/src
Modified Files:
Makefile.pre.in
Log Message:
unifying makefiles
Index: Makefile.pre.in
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Makefile.pre.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.pre.in 3 May 2004 16:54:28 -0000 1.19
--- Makefile.pre.in 4 May 2004 15:40:20 -0000 1.20
***************
*** 55,61 ****
# Compiler options
OPT= @OPT@
! DEFS= @DEFS@
! CFLAGS= $(OPT)
! CPPFLAGS= -I. -I$(srcdir)/Include -I$(srcdir)/Stackless $(DEFS)
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
--- 55,61 ----
# Compiler options
OPT= @OPT@
! BASECFLAGS= @BASECFLAGS@
! CFLAGS= $(BASECFLAGS) $(OPT)
! CPPFLAGS= -I. -I$(srcdir)/Include -I$(srcdir)/Stackless
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
***************
*** 66,71 ****
CFLAGSFORSHARED=@CFLAGSFORSHARED@
# C flags used for building the interpreter object files
! PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
!
# Special C flags for slp_transfer.c
SLPFLAGS= @SLPFLAGS@
--- 66,70 ----
CFLAGSFORSHARED=@CFLAGSFORSHARED@
# C flags used for building the interpreter object files
! PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
# Special C flags for slp_transfer.c
SLPFLAGS= @SLPFLAGS@
***************
*** 110,113 ****
--- 109,117 ----
PYTHONFRAMEWORKPREFIX= @PYTHONFRAMEWORKPREFIX@
PYTHONFRAMEWORKINSTALLDIR= @PYTHONFRAMEWORKINSTALLDIR@
+ # Options to enable prebinding (for fast startup)
+ OTHER_LIBTOOL_OPT = -prebind -seg1addr 0x10000000
+
+ # Environment to run shared python without installed libraries
+ RUNSHARED= @RUNSHARED@
# Modes for directories, executables and data files created by the
***************
*** 139,142 ****
--- 143,147 ----
DLLLIBRARY= @DLLLIBRARY@
LDLIBRARYDIR= @LDLIBRARYDIR@
+ INSTSONAME= @INSTSONAME@
***************
*** 145,151 ****
LIBC= @LIBC@
SYSLIBS= $(LIBM) $(LIBC)
MAINOBJ= @MAINOBJ@
! LIBOBJS= @LIBOBJS@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
--- 150,157 ----
LIBC= @LIBC@
SYSLIBS= $(LIBM) $(LIBC)
+ SHLIBS= @SHLIBS@
MAINOBJ= @MAINOBJ@
! THREADOBJ= @THREADOBJ@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
***************
*** 222,225 ****
--- 228,232 ----
Stackless/module/taskletobject.o \
Stackless/pickling/prickelpit.o \
+ Stackless/pickling/safe_pickle.o \
Python/compile.o \
Python/codecs.o \
***************
*** 251,255 ****
Python/$(DYNLOADFILE) \
$(MACHDEP_OBJS) \
! $(LIBOBJS)
--- 258,262 ----
Python/$(DYNLOADFILE) \
$(MACHDEP_OBJS) \
! $(THREADOBJ)
***************
*** 276,279 ****
--- 283,287 ----
Objects/moduleobject.o \
Objects/object.o \
+ Objects/obmalloc.o \
Objects/rangeobject.o \
Objects/sliceobject.o \
***************
*** 304,308 ****
# Build the interpreter
! $(BUILDPYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
--- 312,316 ----
# Build the interpreter
! $(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
***************
*** 310,314 ****
platform: $(BUILDPYTHON)
! ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
--- 318,322 ----
platform: $(BUILDPYTHON)
! $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
***************
*** 316,321 ****
sharedmods: $(BUILDPYTHON)
case $$MAKEFLAGS in \
! *-s*) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
! *) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
--- 324,329 ----
sharedmods: $(BUILDPYTHON)
case $$MAKEFLAGS in \
! *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
! *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
***************
*** 345,369 ****
$(RANLIB) $@
! # This rule is only here for DG/UX and BeOS!!!
! libpython$(VERSION).so: $(LIBRARY)
! case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
! *dgux*) \
! test -d dgux || mkdir dgux; \
! (cd dgux;ar x ../$^;ld -G -o ../$@ * ); \
! /bin/rm -rf ./dgux \
! ;; \
! beos) \
! $(AR) so $(LIBRARY) $@ \
! ;; \
! esac
! # This rule is here for OPENSTEP/Rhapsody/MacOSX
! $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): $(LIBRARY) $(PYTHONFRAMEWORKDIR)
libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-framework System @LIBTOOL_CRUFT@
# This rule builds the Cygwin Python DLL
libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
- dlltool --export-all --output-def $@ $^
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
$(LIBS) $(MODLIBS) $(SYSLIBS)
--- 353,394 ----
$(RANLIB) $@
! libpython$(VERSION).so: $(LIBRARY_OBJS)
! if test $(INSTSONAME) != $(LDLIBRARY); then \
! $(LDSHARED) -Wl,-soname=$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
! $(LN) -f $(INSTSONAME) $@; \
! else\
! $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
! fi
! libpython$(VERSION).sl: $(LIBRARY_OBJS)
! $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
!
! # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
! # minimal framework (not including the Lib directory and such) in the current
! # directory.
! RESSRCDIR=$(srcdir)/Mac/OSXResources/framework
! $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
! $(LIBRARY) \
! $(RESSRCDIR)/Info.plist \
! $(RESSRCDIR)/version.plist \
! $(RESSRCDIR)/English.lproj/InfoPlist.strings
! $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-framework System @LIBTOOL_CRUFT@
+ $(INSTALL) -d -m $(DIRMODE) \
+ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
+ $(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
+ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/Info.plist
+ $(INSTALL_DATA) $(RESSRCDIR)/version.plist \
+ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/version.plist
+ $(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
+ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj/InfoPlist.strings
+ $(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
+ $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
+ $(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
+ $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
# This rule builds the Cygwin Python DLL
libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
$(LIBS) $(MODLIBS) $(SYSLIBS)
***************
*** 420,424 ****
$(PGEN): $(PGENOBJS)
! $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
--- 445,449 ----
$(PGEN): $(PGENOBJS)
! $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
***************
*** 431,440 ****
Python/getplatform.o: $(srcdir)/Python/getplatform.c
! $(CC) -c $(CFLAGS) $(CPPFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
! $(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
!
! Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
--- 456,463 ----
Python/getplatform.o: $(srcdir)/Python/getplatform.c
! $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
! $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
***************
*** 518,524 ****
# Test the interpreter (twice, once without .pyc files, once with)
TESTOPTS= -l
TESTPROG= $(srcdir)/Lib/test/regrtest.py
! TESTPYTHON= ./$(BUILDPYTHON) -E -tt
test: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
--- 541,554 ----
# Test the interpreter (twice, once without .pyc files, once with)
+ # In the past, we've had problems where bugs in the marshalling or
+ # elsewhere caused bytecode read from .pyc files to behave differently
+ # than bytecode generated directly from a .py source file. Sometimes
+ # the bytecode read from a .pyc file had the bug, somtimes the directly
+ # generated bytecode. This is sometimes a very shy bug needing a lot of
+ # sample data.
+
TESTOPTS= -l
TESTPROG= $(srcdir)/Lib/test/regrtest.py
! TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt
test: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
***************
*** 526,532 ****
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
QUICKTESTOPTS= $(TESTOPTS) -x test_thread test_signal test_strftime \
test_unicodedata test_re test_sre test_select test_poll \
! test_linuxaudiodev test_sunaudiodev
quicktest: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
--- 556,567 ----
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
+ testall: all platform
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+ $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+
QUICKTESTOPTS= $(TESTOPTS) -x test_thread test_signal test_strftime \
test_unicodedata test_re test_sre test_select test_poll \
! test_linuxaudiodev test_struct test_sunaudiodev test_zlib
quicktest: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
***************
*** 555,559 ****
if test $$i != X; then \
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
! $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
fi; \
done
--- 590,594 ----
if test $$i != X; then \
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
! $(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/`basename $$i`; \
fi; \
done
***************
*** 562,568 ****
@for i in $(DESTDIRS); \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
--- 597,603 ----
@for i in $(DESTDIRS); \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
***************
*** 572,599 ****
# Install the interpreter (by creating a hard link to python$(VERSION))
bininstall: altbininstall
! -if test -f $(BINDIR)/$(PYTHON); \
! then rm -f $(BINDIR)/$(PYTHON); \
else true; \
fi
! (cd $(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
@for i in $(BINDIR) $(LIBDIR); \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
done
! $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
! if test -f libpython$(VERSION).so; then \
! $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
! else true; \
! fi
! if test -f "$(DLLLIBRARY)"; then \
! $(INSTALL_SHARED) $(DLLLIBRARY) $(BINDIR); \
else true; \
fi
--- 607,643 ----
# Install the interpreter (by creating a hard link to python$(VERSION))
bininstall: altbininstall
! -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
! then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
! (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
+ @if test "$(PYTHONFRAMEWORKDIR)" != no-framework; then \
+ if test ! -f $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current/Resources/Info.plist; then \
+ echo 'Framework build: use "make frameworkinstall" in stead of "make install"'; \
+ exit 1; \
+ fi; \
+ fi
@for i in $(BINDIR) $(LIBDIR); \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
done
! $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
! if test -f libpython$(VERSION)$(SO); then \
! if test "$(SO)" = .dll; then \
! $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
! else \
! $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
! if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
! (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
! fi \
! fi; \
else true; \
fi
***************
*** 603,628 ****
@for i in $(MANDIR) $(MANDIR)/man1; \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
! $(MANDIR)/man1/python.1
# Install the library
PLATDIR= plat-$(MACHDEP)
! MACHDEPS= $(PLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax
LIBSUBDIRS= lib-old lib-tk site-packages test test/output test/data \
encodings email email/test email/test/data compiler hotshot \
distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
--- 647,685 ----
@for i in $(MANDIR) $(MANDIR)/man1; \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
! $(DESTDIR)$(MANDIR)/man1/python.1
# Install the library
PLATDIR= plat-$(MACHDEP)
! EXTRAPLATDIR= @EXTRAPLATDIR@
! EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
! MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax
+ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
+ plat-mac/lib-scriptpackages/_builtinSuites \
+ plat-mac/lib-scriptpackages/CodeWarrior \
+ plat-mac/lib-scriptpackages/Explorer \
+ plat-mac/lib-scriptpackages/Finder \
+ plat-mac/lib-scriptpackages/Netscape \
+ plat-mac/lib-scriptpackages/StdSuites \
+ plat-mac/lib-scriptpackages/SystemEvents \
+ plat-mac/lib-scriptpackages/Terminal
+ PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
LIBSUBDIRS= lib-old lib-tk site-packages test test/output test/data \
encodings email email/test email/test/data compiler hotshot \
+ logging bsddb bsddb/test csv idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
***************
*** 633,639 ****
if test ! -d $$a; then continue; else true; fi; \
b=$(LIBDEST)/$$d; \
! if test ! -d $$b; then \
echo "Creating directory $$b"; \
! $(INSTALL) -d -m $(DIRMODE) $$b; \
else true; \
fi; \
--- 690,696 ----
if test ! -d $$a; then continue; else true; fi; \
b=$(LIBDEST)/$$d; \
! if test ! -d $(DESTDIR)$$b; then \
echo "Creating directory $$b"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$b; \
else true; \
fi; \
***************
*** 642,649 ****
do \
if test -x $$i; then \
! $(INSTALL_SCRIPT) $$i $(LIBDEST); \
echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
else \
! $(INSTALL_DATA) $$i $(LIBDEST); \
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
--- 699,706 ----
do \
if test -x $$i; then \
! $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
else \
! $(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
***************
*** 665,682 ****
if test -x $$i; then \
echo $(INSTALL_SCRIPT) $$i $$b; \
! $(INSTALL_SCRIPT) $$i $$b; \
else \
echo $(INSTALL_DATA) $$i $$b; \
! $(INSTALL_DATA) $$i $$b; \
fi;; \
esac; \
done; \
done
! $(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
! PYTHONPATH=$(LIBDEST) \
! ./$(BUILDPYTHON) -tt $(LIBDEST)/compileall.py -x badsyntax \
! $(LIBDEST)
! PYTHONPATH=$(LIBDEST) \
! ./$(BUILDPYTHON) -O $(LIBDEST)/compileall.py -x badsyntax $(LIBDEST)
# Create the PLATDIR source directory, if one wasn't distributed..
--- 722,750 ----
if test -x $$i; then \
echo $(INSTALL_SCRIPT) $$i $$b; \
! $(INSTALL_SCRIPT) $$i $(DESTDIR)$$b; \
else \
echo $(INSTALL_DATA) $$i $$b; \
! $(INSTALL_DATA) $$i $(DESTDIR)$$b; \
fi;; \
esac; \
done; \
done
! $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
! PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
! ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
! -d $(LIBDEST) -f \
! -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
! PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
! ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
! -d $(LIBDEST) -f \
! -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
! PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
! ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
! -d $(LIBDEST)/site-packages -f \
! -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
! PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
! ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
! -d $(LIBDEST)/site-packages -f \
! -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
# Create the PLATDIR source directory, if one wasn't distributed..
***************
*** 695,701 ****
@for i in $(INCLDIRSTOMAKE); \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
--- 763,769 ----
@for i in $(INCLDIRSTOMAKE); \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
***************
*** 704,710 ****
do \
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
! $(INSTALL_DATA) $$i $(INCLUDEPY); \
done
! $(INSTALL_DATA) pyconfig.h $(CONFINCLUDEPY)/pyconfig.h
# Install the library and miscellaneous stuff needed for extending/embedding
--- 772,778 ----
do \
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
! $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
done
! $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
# Install the library and miscellaneous stuff needed for extending/embedding
***************
*** 714,751 ****
@for i in $(LIBDIR) $(LIBP) $(LIBPL); \
do \
! if test ! -d $$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
done
! @if test -d $(LDLIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
! $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
! $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
else \
! echo Skip install of $(LDLIBRARY) - use make frameworkinstall; \
fi; \
fi
! $(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
! $(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ)
! $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
! $(INSTALL_DATA) Makefile $(LIBPL)/Makefile
! $(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
! $(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
! $(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
! $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
! $(INSTALL_SCRIPT) $(srcdir)/install-sh $(LIBPL)/install-sh
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
$(INSTALL_DATA) Modules/python.exp \
! $(LIBPL)/python.exp; \
echo; echo "$(LIBPL)/python.exp"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
! $(LIBPL)/makexp_aix; \
echo "$(LIBPL)/makexp_aix"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \
! $(LIBPL)/ld_so_aix; \
echo "$(LIBPL)/ld_so_aix"; \
echo; echo "See Misc/AIX-NOTES for details."; \
--- 782,823 ----
@for i in $(LIBDIR) $(LIBP) $(LIBPL); \
do \
! if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
done
! @if test -d $(LIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
! if test "$(SO)" = .dll; then \
! $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
! else \
! $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
! $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
! fi; \
else \
! echo Skip install of $(LIBRARY) - use make frameworkinstall; \
fi; \
fi
! $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
! $(INSTALL_DATA) Modules/$(MAINOBJ) $(DESTDIR)$(LIBPL)/$(MAINOBJ)
! $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
! $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
! $(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
! $(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
! $(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
! $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
! $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
$(INSTALL_DATA) Modules/python.exp \
! $(DESTDIR)$(LIBPL)/python.exp; \
echo; echo "$(LIBPL)/python.exp"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
! $(DESTDIR)$(LIBPL)/makexp_aix; \
echo "$(LIBPL)/makexp_aix"; \
$(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \
! $(DESTDIR)$(LIBPL)/ld_so_aix; \
echo "$(LIBPL)/ld_so_aix"; \
echo; echo "See Misc/AIX-NOTES for details."; \
***************
*** 754,762 ****
@case "$(MACHDEP)" in beos*) \
echo; echo "Installing support files for building shared extension modules on BeOS:"; \
! $(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README; \
echo; echo "$(LIBPL)/README"; \
! $(INSTALL_SCRIPT) Modules/ar_beos $(LIBPL)/ar_beos; \
echo "$(LIBPL)/ar_beos"; \
! $(INSTALL_SCRIPT) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
echo "$(LIBPL)/ld_so_beos"; \
echo; echo "See Misc/BeOS-NOTES for details."; \
--- 826,834 ----
@case "$(MACHDEP)" in beos*) \
echo; echo "Installing support files for building shared extension modules on BeOS:"; \
! $(INSTALL_DATA) Misc/BeOS-NOTES $(DESTDIR)$(LIBPL)/README; \
echo; echo "$(LIBPL)/README"; \
! $(INSTALL_SCRIPT) Modules/ar_beos $(DESTDIR)$(LIBPL)/ar_beos; \
echo "$(LIBPL)/ar_beos"; \
! $(INSTALL_SCRIPT) Modules/ld_so_beos $(DESTDIR)$(LIBPL)/ld_so_beos; \
echo "$(LIBPL)/ld_so_beos"; \
echo; echo "See Misc/BeOS-NOTES for details."; \
***************
*** 767,799 ****
# This goes into $(exec_prefix)
sharedinstall:
! ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
--install-scripts=$(BINDIR) \
! --install-platlib=$(DESTSHARED)
!
! # Install a MacOSX framework During build (before
! # setup.py), make a minimal Python.framework directory structure in the build
! # directory. This framework is minimal, it doesn't contain the Lib directory
! # and such, but together with some magic in Modules/getpath.c it is good enough
! # to run python from the install dir.
! FRAMEWORKDEST=$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
! RESSRCDIR=$(srcdir)/Mac/OSXResources/framework
! $(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
! $(RESSRCDIR)/version.plist \
! $(RESSRCDIR)/English.lproj/InfoPlist.strings
! @if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
! echo Not configured with --enable-framework; \
! exit 1; \
! else true; \
! fi
! $(INSTALL) -d -m $(DIRMODE) $(FRAMEWORKDEST)/Resources/English.lproj
! $(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(FRAMEWORKDEST)/Resources/Info.plist
! $(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKDEST)/Resources/version.plist
! $(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! $(FRAMEWORKDEST)/Resources/English.lproj/InfoPlist.strings
! $(LN) -fs $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
! $(LN) -fs Versions/Current/Python $(PYTHONFRAMEWORKDIR)/Python
! $(LN) -fs Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
! $(LN) -fs Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
# On install, we re-make the framework
--- 839,855 ----
# This goes into $(exec_prefix)
sharedinstall:
! $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
! --prefix=$(prefix) \
--install-scripts=$(BINDIR) \
! --install-platlib=$(DESTSHARED) \
! --root=/$(DESTDIR)
! # Here are a couple of targets for MacOSX again, to install a full
! # framework-based Python. frameworkinstall installs everything, the
! # subtargets install specific parts. Much of the actual work is offloaded to
! # the Makefile in Mac/OSX
! #
! frameworkinstall: frameworkinstallframework \
! frameworkinstallapps frameworkinstallunixtools
# On install, we re-make the framework
***************
*** 803,809 ****
# only have to cater for the structural bits of the framework.
! frameworkinstall: install frameworkinfrastructureinstall
! FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
! frameworkinfrastructureinstall: $(LDLIBRARY)
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \
--- 859,865 ----
# only have to cater for the structural bits of the framework.
! frameworkinstallframework: frameworkinstallstructure install frameworkinstallmaclib
!
! frameworkinstallstructure: $(LDLIBRARY)
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
echo Not configured with --enable-framework; \
***************
*** 811,831 ****
else true; \
fi
! @for i in $(FRAMEWORKFINALDEST)/Resources/English.lproj $(FRAMEWORKFINALDEST)/lib; do\
! if test ! -d $$i; then \
! echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
done
! $(LN) -sf $(INCLUDEPY) $(FRAMEWORKFINALDEST)/Headers
! $(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(FRAMEWORKFINALDEST)/Resources/Info.plist
! $(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKFINALDEST)/Resources/version.plist
$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! $(FRAMEWORKFINALDEST)/Resources/English.lproj/InfoPlist.strings
! $(LN) -fs $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
! $(LN) -fs Versions/Current/Python $(PYTHONFRAMEWORKINSTALLDIR)/Python
! $(LN) -fs Versions/Current/Headers $(PYTHONFRAMEWORKINSTALLDIR)/Headers
! $(LN) -fs Versions/Current/Resources $(PYTHONFRAMEWORKINSTALLDIR)/Resources
! $(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
# Build the toplevel Makefile
--- 867,921 ----
else true; \
fi
! @for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
! if test ! -d $(DESTDIR)$$i; then \
! echo "Creating directory $(DESTDIR)$$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
done
! $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
! $(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(DESTDIR)$(prefix)/Resources/Info.plist
! $(INSTALL_DATA) $(RESSRCDIR)/version.plist $(DESTDIR)$(prefix)/Resources/version.plist
$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! $(DESTDIR)$(prefix)/Resources/English.lproj/InfoPlist.strings
! $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
! $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
! $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
! $(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
! $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
!
! # This installs Mac/Lib into the framework
! frameworkinstallmaclib:
! $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
! $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
! DESTDIR=$(DESTDIR)
!
! # This installs the IDE, the Launcher and other apps into /Applications
! frameworkinstallapps:
! $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
! $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
!
! # This install the unix python and pythonw tools in /usr/local/bin
! frameworkinstallunixtools:
! $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
! DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
!
! # This installs the Demos and Tools into the applications directory.
! # It is not part of a normal frameworkinstall
! frameworkinstallextras:
! $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
! $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
!
! # This installs a few of the useful scripts in Tools/scripts
! scriptsinstall:
! SRCDIR=$(srcdir) $(RUNSHARED) \
! ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
! --prefix=$(prefix) \
! --install-scripts=$(BINDIR) \
! --root=/$(DESTDIR)
# Build the toplevel Makefile
***************
*** 882,885 ****
--- 972,976 ----
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
+ -rm -rf $(PYTHONFRAMEWORKDIR)
# Make things extra clean, before making a distribution:
***************
*** 932,934 ****
--- 1023,1033 ----
Python/thread.o: @THREADHEADERS@
+ # Declare targets that aren't real files
+ .PHONY: all sharedmods oldsharedmods test quicktest memtest
+ .PHONY: install altinstall oldsharedinstall bininstall altbininstall
+ .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
+ .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
+ .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
+ .PHONY: recheck autoconf clean clobber distclean smelly funny
+
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins
More information about the Stackless-checkins
mailing list