churchyard / rpms / python2

Forked from rpms/python2 2 years ago
Clone
8dfcda
diff -up Python-2.7.6/Makefile.pre.in.no-static-lib Python-2.7.6/Makefile.pre.in
8dfcda
--- Python-2.7.6/Makefile.pre.in.no-static-lib	2014-01-29 13:58:32.933226720 +0100
8dfcda
+++ Python-2.7.6/Makefile.pre.in	2014-01-29 14:10:25.002247272 +0100
8dfcda
@@ -437,7 +437,7 @@ coverage:
3fdd60
 
3fdd60
 
3fdd60
 # Build the interpreter
3fdd60
-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
3fdd60
+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY)
3fdd60
 		$(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
3fdd60
 			Modules/python.o \
3fdd60
 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
8dfcda
@@ -464,18 +464,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
8dfcda
 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
43e7c4
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
3fdd60
 
3fdd60
-# Build static library
3fdd60
-# avoid long command lines, same as LIBRARY_OBJS
3fdd60
-$(LIBRARY): $(LIBRARY_OBJS)
3fdd60
-	-rm -f $@
c6247f
-	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
c6247f
-	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
c6247f
-	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
c6247f
-	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
c6247f
-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
c6247f
-	$(AR) $(ARFLAGS) $@ $(MODOBJS)
3fdd60
-	$(RANLIB) $@
3fdd60
-
3fdd60
 libpython$(VERSION).so: $(LIBRARY_OBJS)
3fdd60
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
42d74b
 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
8dfcda
@@ -1097,18 +1085,6 @@ libainstall:	all python-config
3fdd60
 		else	true; \
3fdd60
 		fi; \
3fdd60
 	done
3fdd60
-	@if test -d $(LIBRARY); then :; else \
3fdd60
-		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
3fdd60
-			if test "$(SO)" = .dll; then \
3fdd60
-				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
3fdd60
-			else \
3fdd60
-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
3fdd60
-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
3fdd60
-			fi; \
3fdd60
-		else \
3fdd60
-			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
3fdd60
-		fi; \
3fdd60
-	fi
3fdd60
 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
3fdd60
 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
3fdd60
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in