Matej Stuchlik 2c1c983
diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec/Makefile.pre.in
Matej Stuchlik 2c1c983
--- cpython-59223da36dec/Makefile.pre.in.no-static-lib	2012-08-07 16:43:43.296466422 -0400
Matej Stuchlik 2c1c983
+++ cpython-59223da36dec/Makefile.pre.in	2012-08-07 16:44:13.299464371 -0400
Matej Stuchlik 2c1c983
@@ -464,7 +464,7 @@ coverage:
Matej Stuchlik 2c1c983
 	$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 # Build the interpreter
Matej Stuchlik 2c1c983
-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik 2c1c983
+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik 2c1c983
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 platform: $(BUILDPYTHON) pybuilddir.txt
Matej Stuchlik 2c1c983
@@ -480,18 +480,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA
Matej Stuchlik 2c1c983
 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
Matej Stuchlik 2c1c983
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
-# Build static library
Matej Stuchlik 2c1c983
-# avoid long command lines, same as LIBRARY_OBJS
Matej Stuchlik 2c1c983
-$(LIBRARY): $(LIBRARY_OBJS)
Matej Stuchlik 2c1c983
-	-rm -f $@
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
Matej Stuchlik 2c1c983
-	$(AR) $(ARFLAGS) $@ $(MODOBJS)
Matej Stuchlik 2c1c983
-	$(RANLIB) $@
Matej Stuchlik 2c1c983
-
Matej Stuchlik 2c1c983
 libpython$(LDVERSION).so: $(LIBRARY_OBJS)
Matej Stuchlik 2c1c983
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
Matej Stuchlik 2c1c983
 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
Matej Stuchlik 2c1c983
@@ -581,7 +569,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
Matej Stuchlik 2c1c983
 		echo "-----------------------------------------------"; \
Matej Stuchlik 2c1c983
 	fi
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
-Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik 2c1c983
+Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik 2c1c983
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
Matej Stuchlik 2c1c983
 
Matej Stuchlik 2c1c983
 ############################################################################
Matej Stuchlik 2c1c983
@@ -1155,18 +1143,6 @@ libainstall:	all python-config
Matej Stuchlik 2c1c983
 		else	true; \
Matej Stuchlik 2c1c983
 		fi; \
Matej Stuchlik 2c1c983
 	done
Matej Stuchlik 2c1c983
-	@if test -d $(LIBRARY); then :; else \
Matej Stuchlik 2c1c983
-		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
Matej Stuchlik 2c1c983
-			if test "$(SHLIB_SUFFIX)" = .dll; then \
Matej Stuchlik 2c1c983
-				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
Matej Stuchlik 2c1c983
-			else \
Matej Stuchlik 2c1c983
-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
Matej Stuchlik 2c1c983
-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
Matej Stuchlik 2c1c983
-			fi; \
Matej Stuchlik 2c1c983
-		else \
Matej Stuchlik 2c1c983
-			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
Matej Stuchlik 2c1c983
-		fi; \
Matej Stuchlik 2c1c983
-	fi
Matej Stuchlik 2c1c983
 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
Matej Stuchlik 2c1c983
 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
Matej Stuchlik 2c1c983
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in