From: Guido van Rossum <guido@python.org>
Date: Wed, 20 Aug 1997 22:45:52 +0000 (+0000)
Subject: When we have signalmodule.o, remove intrcheck.o as well as sigcheck.o.
X-Git-Tag: v1.5a4~354
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f46fc6d577ad1756ce8d2485938fd02a45fa709;p=thirdparty%2FPython%2Fcpython.git

When we have signalmodule.o, remove intrcheck.o as well as sigcheck.o.
---

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 6c5ddb190930..42e6601a6f7a 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -111,12 +111,13 @@ $(ASHAREDMODULE)$(SO): $(ASHAREDMODULESOBS)
 	$(ASHAREDMODULESEXTRA)
 
 # This target is used by the master Makefile to add the objects to the library.
-# To deal with the conflict between signalmodule.o and sigcheck.o,
-# we remove the latter if we have the former.
+# 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)
 		$(AR) cr $(LIBRARY) $(OBJS)
 		-if ar x $(LIBRARY) signalmodule.o 2>/dev/null; \
-		then ar d $(LIBRARY) sigcheck.o 2>/dev/null; true; \
+		then \
+		  ar d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; true; \
 		else true; fi
 		touch add2lib