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