diff options
| author | Guido van Rossum <guido@python.org> | 1998-10-07 22:51:56 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1998-10-07 22:51:56 (GMT) |
| commit | 2a570049acf2789bfbe2d907a188895249f17b62 (patch) | |
| tree | 4b6114d0e99dbcfb5e11e1ebae7e305a45d1564f /Modules/Makefile.pre.in | |
| parent | 2e23c3125a96d55509e227b34048a2f4bdce9f68 (diff) | |
| download | cpython-2a570049acf2789bfbe2d907a188895249f17b62.zip cpython-2a570049acf2789bfbe2d907a188895249f17b62.tar.gz cpython-2a570049acf2789bfbe2d907a188895249f17b62.tar.bz2 | |
Changes to deal with the sigcheck+intrcheck vs. signalmodule controversy.
Diffstat (limited to 'Modules/Makefile.pre.in')
| -rw-r--r-- | Modules/Makefile.pre.in | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index ca728e0..4d306e7 100644 --- a/Modules/Makefile.pre.in +++ b/Modules/Makefile.pre.in @@ -110,12 +110,10 @@ all: $(OBJS) # To deal with the conflict between signalmodule.o and # sigcheck.o+intrcheck.o, we remove the latter two if we have the former. add2lib: $(OBJS) - -for i in $(OBJS); do \ - if test "$$i" = "signalmodule.o"; then \ - $(AR) d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; \ - break; \ - fi; \ - done + -if test -f hassignal; \ + then echo removing sigcheck.o intrcheck.o; \ + $(AR) d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; \ + else echo leaving sigcheck.o intrcheck.o in; fi $(AR) cr $(LIBRARY) $(OBJS) touch add2lib @@ -152,6 +150,14 @@ config.c Makefile: -rm -f $(LIBRARY) $(SHELL) $(MAKESETUP) Setup.thread Setup.local Setup +hassignal: + -rm -f hassignal + -for i in $(OBJS); do \ + if test "$$i" = "signalmodule.o"; then \ + echo yes >hassignal; break; \ + fi; \ + done + Setup: cp $(srcdir)/Setup.in Setup |