7b4659
diff -up Python-2.6.4/Makefile.pre.in.no-static-lib Python-2.6.4/Makefile.pre.in
7b4659
--- Python-2.6.4/Makefile.pre.in.no-static-lib	2010-01-18 13:11:10.975859689 -0500
7b4659
+++ Python-2.6.4/Makefile.pre.in	2010-01-18 13:14:27.524859334 -0500
7b4659
@@ -382,7 +382,7 @@ coverage:
7b4659
 
7b4659
 
7b4659
 # Build the interpreter
7b4659
-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
7b4659
+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY)
7b4659
 		$(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
7b4659
 			Modules/python.o \
7b4659
 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
7b4659
@@ -398,18 +398,6 @@ sharedmods: $(BUILDPYTHON)
7b4659
 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
7b4659
 	esac
7b4659
 
7b4659
-# Build static library
7b4659
-# avoid long command lines, same as LIBRARY_OBJS
7b4659
-$(LIBRARY): $(LIBRARY_OBJS)
7b4659
-	-rm -f $@
7b4659
-	$(AR) cr $@ Modules/getbuildinfo.o
7b4659
-	$(AR) cr $@ $(PARSER_OBJS)
7b4659
-	$(AR) cr $@ $(OBJECT_OBJS)
7b4659
-	$(AR) cr $@ $(PYTHON_OBJS)
7b4659
-	$(AR) cr $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
7b4659
-	$(AR) cr $@ $(MODOBJS)
7b4659
-	$(RANLIB) $@
7b4659
-
7b4659
 libpython$(VERSION).so: $(LIBRARY_OBJS)
7b4659
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
7b4659
 		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
7b4659
@@ -945,18 +933,6 @@ libainstall:	all
7b4659
 		else	true; \
7b4659
 		fi; \
7b4659
 	done
7b4659
-	@if test -d $(LIBRARY); then :; else \
7b4659
-		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
7b4659
-			if test "$(SO)" = .dll; then \
7b4659
-				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
7b4659
-			else \
7b4659
-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
7b4659
-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
7b4659
-			fi; \
7b4659
-		else \
7b4659
-			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
7b4659
-		fi; \
7b4659
-	fi
7b4659
 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
7b4659
 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
7b4659
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in