[zopeorg-checkins] CVS: Products/BTreeFolder-0.3 - Makefile:1.2 Makefile.pre:1.2 config.c:1.2 sedscript:1.2
Chris McDonough
chrism at zope.com
Mon Apr 29 14:09:02 EDT 2002
Update of /cvs-zopeorg/Products/BTreeFolder-0.3
In directory cvs.zope.org:/tmp/cvs-serv13886
Modified Files:
Makefile Makefile.pre config.c sedscript
Log Message:
Recreating makefiles.
=== Products/BTreeFolder-0.3/Makefile 1.1.1.1 => 1.2 ===
# The prefix used by "make inclinstall libainstall" of core python
-installdir= /usr
+installdir= /home/zope/opt/Python2
# The exec_prefix used by the same
-exec_installdir=/usr
+exec_installdir=/home/zope/opt/Python2
# Source directory and VPATH in case you want to use VPATH.
# (You will have to edit these two lines yourself -- there is no
@@ -94,7 +94,7 @@
TARGET= python
# Installed python binary (used only by boot target)
-PYTHON= python
+PYTHON= python2.1
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -112,13 +112,12 @@
# === Definitions added by makesetup ===
LOCALMODLIBS=
-BASEMODLIBS=
-SHAREDMODS= cBTreeFolderMixin$(SO)
-TKPATH=:lib-tk
-SSLOPT=-I/usr/include/openssl -DUSE_SSL -lssl -lcrypto
+BASEMODLIBS=
+SHAREDMODS= ./cBTreeFolderMixin$(SO)
GLHACK=-Dclear=__GLclear
PYTHONPATH=$(COREPYTHONPATH)
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH)
+TKPATH=:lib-tk
MACHDEPPATH=:plat-$(MACHDEP)
TESTPATH=
SITEPATH=
@@ -129,30 +128,30 @@
# === Variables from configure (through sedscript) ===
-VERSION= 1.5
-CC= gcc
+VERSION= 2.1
+CC= gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
LINKCC= $(PURIFY) $(CC)
SGI_ABI=
-OPT= -g -O2
+OPT= -g -O2 -Wall -Wstrict-prototypes
LDFLAGS=
LDLAST=
DEFS= -DHAVE_CONFIG_H
-LIBS= -lieee -ldl -lpthread
+LIBS= -lpthread -ldl -lutil
LIBM= -lm
LIBC=
RANLIB= ranlib
-MACHDEP= linux-i386
+MACHDEP= linux2
SO= .so
LDSHARED= gcc -shared
CCSHARED= -fPIC
-LINKFORSHARED= -rdynamic
-CXX= @CXX@
+LINKFORSHARED= -Xlinker -export-dynamic
+CXX= c++
# Install prefix for architecture-independent files
-prefix= /usr
+prefix= /home/zope/opt/Python-2.1.3
# Install prefix for architecture-dependent files
-exec_prefix= /usr
+exec_prefix= ${prefix}
# Uncomment the following two lines for AIX
#LINKCC= $(LIBPL)/makexp_aix $(LIBPL)/python.exp "" $(LIBRARY); $(PURIFY) $(CC)
@@ -323,5 +322,5 @@
# Rules appended by makedepend
-cBTreeFolderMixin.o: $(srcdir)/cBTreeFolderMixin.c; $(CC) $(CCSHARED) -I/home/zope/opt/Zope/lib/python/ZODB -I/home/zope/opt/Zope/lib/Components/ExtensionClass/src $(CFLAGS) -c $(srcdir)/cBTreeFolderMixin.c
-cBTreeFolderMixin$(SO): cBTreeFolderMixin.o; $(LDSHARED) cBTreeFolderMixin.o -o cBTreeFolderMixin$(SO)
+./cBTreeFolderMixin.o: $(srcdir)/./cBTreeFolderMixin.c; $(CC) $(CCSHARED) $(CFLAGS) -I/home/zope/opt/Zope/lib/python/ZODB -I/home/zope/opt/Zope/lib/Components/ExtensionClass/src -c $(srcdir)/./cBTreeFolderMixin.c -o ./cBTreeFolderMixin.o
+./cBTreeFolderMixin$(SO): ./cBTreeFolderMixin.o; $(LDSHARED) ./cBTreeFolderMixin.o -o ./cBTreeFolderMixin$(SO)
=== Products/BTreeFolder-0.3/Makefile.pre 1.1.1.1 => 1.2 ===
# The prefix used by "make inclinstall libainstall" of core python
-installdir= /usr
+installdir= /home/zope/opt/Python2
# The exec_prefix used by the same
-exec_installdir=/usr
+exec_installdir=/home/zope/opt/Python2
# Source directory and VPATH in case you want to use VPATH.
# (You will have to edit these two lines yourself -- there is no
@@ -93,7 +93,7 @@
TARGET= python
# Installed python binary (used only by boot target)
-PYTHON= python
+PYTHON= python2.1
# Add more -I and -D options here
CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -112,30 +112,30 @@
# === Variables from configure (through sedscript) ===
-VERSION= 1.5
-CC= gcc
+VERSION= 2.1
+CC= gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
LINKCC= $(PURIFY) $(CC)
SGI_ABI=
-OPT= -g -O2
+OPT= -g -O2 -Wall -Wstrict-prototypes
LDFLAGS=
LDLAST=
DEFS= -DHAVE_CONFIG_H
-LIBS= -lieee -ldl -lpthread
+LIBS= -lpthread -ldl -lutil
LIBM= -lm
LIBC=
RANLIB= ranlib
-MACHDEP= linux-i386
+MACHDEP= linux2
SO= .so
LDSHARED= gcc -shared
CCSHARED= -fPIC
-LINKFORSHARED= -rdynamic
-CXX= @CXX@
+LINKFORSHARED= -Xlinker -export-dynamic
+CXX= c++
# Install prefix for architecture-independent files
-prefix= /usr
+prefix= /home/zope/opt/Python-2.1.3
# Install prefix for architecture-dependent files
-exec_prefix= /usr
+exec_prefix= ${prefix}
# Uncomment the following two lines for AIX
#LINKCC= $(LIBPL)/makexp_aix $(LIBPL)/python.exp "" $(LIBRARY); $(PURIFY) $(CC)
=== Products/BTreeFolder-0.3/config.c 1.1.1.1 => 1.2 ===
+/* Generated automatically from /home/zope/opt/Python2/lib/python2.1/config/config.c.in by makesetup. */
/* -*- C -*- ***********************************************
-Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
-The Netherlands.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Stichting Mathematisch
-Centrum or CWI or Corporation for National Research Initiatives or
-CNRI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-While CWI is the initial source for this software, a modified version
-is made available by the Corporation for National Research Initiatives
-(CNRI) at the Internet address ftp://ftp.python.org.
-
-STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
-CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+Copyright (c) 2000, BeOpen.com.
+Copyright (c) 1995-2000, Corporation for National Research Initiatives.
+Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
+All rights reserved.
+See the file "Misc/COPYRIGHT" for information on usage and
+redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
******************************************************************/
/* Module configuration */
@@ -40,35 +19,38 @@
#include "Python.h"
-extern void initregex();
-extern void initpcre();
-extern void initposix();
-extern void initsignal();
+extern void initgc(void);
+extern void initthread(void);
+extern void initsignal(void);
+extern void initposix(void);
+extern void init_sre(void);
/* -- ADDMODULE MARKER 1 -- */
-extern void PyMarshal_Init();
-extern void initimp();
+extern void PyMarshal_Init(void);
+extern void initimp(void);
struct _inittab _PyImport_Inittab[] = {
- {"regex", initregex},
- {"pcre", initpcre},
- {"posix", initposix},
+ {"gc", initgc},
+ {"thread", initthread},
{"signal", initsignal},
+ {"posix", initposix},
+ {"_sre", init_sre},
/* -- ADDMODULE MARKER 2 -- */
- /* This module "lives in" with marshal.c */
+ /* This module lives in marshal.c */
{"marshal", PyMarshal_Init},
- /* This lives it with import.c */
+ /* This lives in import.c */
{"imp", initimp},
/* These entries are here for sys.builtin_module_names */
{"__main__", NULL},
{"__builtin__", NULL},
{"sys", NULL},
+ {"exceptions", init_exceptions},
/* Sentinel */
{0, 0}
=== Products/BTreeFolder-0.3/sedscript 1.1.1.1 => 1.2 ===
# Generated automatically from Makefile.pre.in by sedscript.
-s%@VERSION[@]%1.5%
-s%@CC[@]%gcc%
+s%@VERSION[@]%2.1%
+s%@CC[@]%gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64%
+s%@CXX[@]%c++%
+s%@LINKCC[@]%$(PURIFY) $(CC)%
s%@RANLIB[@]%ranlib%
-s%@OPT[@]%-g -O2%
+s%@OPT[@]%-g -O2 -Wall -Wstrict-prototypes%
+s%@DEFS[@]%-DHAVE_CONFIG_H%
s%@LDFLAGS[@]%%
s%@LDLAST[@]% %
s%@SGI_ABI[@]%%
-s%@DEFS[@]%-DHAVE_CONFIG_H%
-s%@LIBS[@]%-lieee -ldl -lpthread%
-s%@LIBM[@]%-lm%
-s%@LIBC[@]%%
-s%@MACHDEP[@]%linux-i386%
-s%^prefix=.*%prefix= /usr%
-s%^exec_prefix=.*%exec_prefix= /usr%
+s%@CCSHARED[@]%-fPIC%
+s%@LINKFORSHARED[@]%-Xlinker -export-dynamic%
+s%@MACHDEP[@]%linux2%
+s%^prefix=.*%prefix= /home/zope/opt/Python-2.1.3%
+s%^exec_prefix=.*%exec_prefix= ${prefix}%
s%@SO[@]%.so%
s%@LDSHARED[@]%gcc -shared%
-s%@CCSHARED[@]%-fPIC%
-s%@LINKFORSHARED[@]%-rdynamic%
-s%@LINKCC[@]%$(PURIFY) $(CC)%
-/^installdir=/s%=.*%= /usr%
-/^exec_installdir=/s%=.*%=/usr%
+s%@LIBS[@]%-lpthread -ldl -lutil%
+s%@LIBM[@]%-lm%
+s%@LIBC[@]%%
+/^installdir=/s%=.*%= /home/zope/opt/Python2%
+/^exec_installdir=/s%=.*%=/home/zope/opt/Python2%
/^srcdir=/s%=.*%= .%
/^VPATH=/s%=.*%= .%
/^LINKPATH=/s%=.*%= %
More information about the zopeorg-checkins
mailing list