summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1994-08-23 13:51:25 (GMT)
committerGuido van Rossum <guido@python.org>1994-08-23 13:51:25 (GMT)
commit794b93ea8ac56f1376826826b9211f5cc0b0ef36 (patch)
tree2dddbb834e3057e7e48c243035f5419765774699
parentaa0f4c73e5001218ca1fafd9053dda7d80dd8fff (diff)
downloadcpython-794b93ea8ac56f1376826826b9211f5cc0b0ef36.zip
cpython-794b93ea8ac56f1376826826b9211f5cc0b0ef36.tar.gz
cpython-794b93ea8ac56f1376826826b9211f5cc0b0ef36.tar.bz2
* Modules/Setup.*: removed all except Setup.in (huh? I thought
I'd done that already?!); disable gdbm by default * configure.in, */Makefile*.in: OPT can now be specified in the env at configure time and will then be put in all Makefiles as default * */Makefile*.in: remove lib*.a before adding to it
-rw-r--r--Modules/Makefile.pre.in3
-rw-r--r--Modules/Setup.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 847412f..c05f4d7 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -34,7 +34,7 @@ prefix= /usr/local
# === Variables that are customizable by hand ===
INCLDIR= $(srcdir)/../Include
-OPT= -O
+OPT= @OPT@
CFLAGS= $(OPT) -I$(INCLDIR) -I.. $(DEFS)
MKDEP= mkdep
@@ -61,6 +61,7 @@ SYSLIBS= $(LIBM) $(LIBC)
all: $(LIB) ../python
$(LIB): $(OBJS)
+ -rm -f $(LIB)
$(AR) cr $(LIB) $(OBJS)
$(RANLIB) $(LIB)
diff --git a/Modules/Setup.in b/Modules/Setup.in
index 04157d4..82a26cc 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -205,7 +205,7 @@ rotor rotormodule.o
# Anthony Baxter's gdbm module (derived from Jack's dbm module)
# GNU dbm(3) will require -lgdbm
-gdbm gdbmmodule.o -I/usr/local/include -L/usr/local/lib -lgdbm
+# gdbm gdbmmodule.o -I/usr/local/include -L/usr/local/lib -lgdbm
# Example -- included for reference only