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 | |
| 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.
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | Modules/Makefile.pre.in | 18 | ||||
| -rw-r--r-- | Parser/Makefile.in | 9 | ||||
| -rw-r--r-- | Python/Makefile.in | 10 |
4 files changed, 27 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index aec17f0..23c4060 100644 --- a/Makefile.in +++ b/Makefile.in @@ -432,6 +432,7 @@ Makefiles: config.status Modules/Makefile.pre (echo making Makefile in subdirectory $$i; cd $$i; \ $(MAKE) Makefile); \ done + -(rm -f Modules/hassignal; cd Modules; $(MAKE) hassignal) # Build the intermediate Makefile in Modules Modules/Makefile.pre: config.status 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 diff --git a/Parser/Makefile.in b/Parser/Makefile.in index bf35805..5396680 100644 --- a/Parser/Makefile.in +++ b/Parser/Makefile.in @@ -34,7 +34,9 @@ POBJS= acceler.o grammar1.o \ parsetok.o tokenizer.o bitset.o \ metagrammar.o -OBJS= $(POBJS) intrcheck.o myreadline.o +AROBJS= $(POBJS) myreadline.o +OBJS= $(AROBJS) intrcheck.o + PGENMAIN= pgenmain.o @@ -54,7 +56,10 @@ all: $(PGEN) $(OBJS) # This target is used by the master Makefile to add the objects to the library add2lib: $(OBJS) - $(AR) cr $(LIBRARY) $(OBJS) + $(AR) cr $(LIBRARY) $(AROBJS) + if test ! -f ../Modules/hassignal; \ + then echo adding intrcheck.o; $(AR) r $(LIBRARY) intrcheck.o; \ + else echo leaving intrcheck.o out; fi touch add2lib $(PGEN): $(PGENOBJS) diff --git a/Python/Makefile.in b/Python/Makefile.in index d7f068c..1888609 100644 --- a/Python/Makefile.in +++ b/Python/Makefile.in @@ -34,7 +34,7 @@ SHELL= /bin/sh # === Fixed definitions === -OBJS= \ +AROBJS= \ bltinmodule.o \ ceval.o compile.o \ errors.o \ @@ -44,9 +44,10 @@ OBJS= \ import.o importdl.o \ marshal.o modsupport.o mystrtoul.o \ pyfpe.o pystate.o pythonrun.o \ - sigcheck.o structmember.o sysmodule.o \ + structmember.o sysmodule.o \ traceback.o \ $(LIBOBJS) +OBJS= $(AROBJS) sigcheck.o LIBRARY= ../libpython$(VERSION).a @@ -57,7 +58,10 @@ all: $(OBJS) # This target is used by the master Makefile to add the objects to the library add2lib: $(OBJS) - $(AR) cr $(LIBRARY) $(OBJS) + $(AR) cr $(LIBRARY) $(AROBJS) + if test ! -f ../Modules/hassignal; \ + then echo adding sigcheck.o; $(AR) r $(LIBRARY) sigcheck.o; \ + else echo leaving sigcheck.o out; fi touch add2lib clean: |