2010-07-21 20:48:17 +00:00
|
|
|
diff -up Python-2.7rc1/Makefile.pre.in.no-static-lib Python-2.7rc1/Makefile.pre.in
|
|
|
|
|
--- Python-2.7rc1/Makefile.pre.in.no-static-lib 2010-06-06 14:47:52.929975429 -0400
|
|
|
|
|
+++ Python-2.7rc1/Makefile.pre.in 2010-06-06 14:48:34.163350302 -0400
|
|
|
|
|
@@ -393,7 +393,7 @@ coverage:
|
2010-01-18 18:51:20 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# Build the interpreter
|
|
|
|
|
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
|
|
|
|
+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
|
|
|
|
$(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
|
|
|
Modules/python.o \
|
|
|
|
|
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
2010-07-21 20:48:17 +00:00
|
|
|
@@ -409,18 +409,6 @@ sharedmods: $(BUILDPYTHON)
|
|
|
|
|
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
2010-01-18 18:51:20 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
-# Build static library
|
|
|
|
|
-# avoid long command lines, same as LIBRARY_OBJS
|
|
|
|
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
|
|
- -rm -f $@
|
2010-07-21 20:48:17 +00:00
|
|
|
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
2010-01-18 18:51:20 +00:00
|
|
|
- $(RANLIB) $@
|
|
|
|
|
-
|
|
|
|
|
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
|
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
|
|
|
|
$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
2010-07-21 20:48:17 +00:00
|
|
|
@@ -1002,18 +990,6 @@ libainstall: all python-config
|
2010-01-18 18:51:20 +00:00
|
|
|
else true; \
|
|
|
|
|
fi; \
|
|
|
|
|
done
|
|
|
|
|
- @if test -d $(LIBRARY); then :; else \
|
|
|
|
|
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
|
|
|
|
- if test "$(SO)" = .dll; then \
|
|
|
|
|
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
|
|
|
- else \
|
|
|
|
|
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
|
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- else \
|
|
|
|
|
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- fi
|
|
|
|
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
|
|
|
|
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
|
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
