torsava / rpms / python3

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