|
 |
aa4aef2 |
diff -up Python-3.1.1/Makefile.pre.in.no-static-lib Python-3.1.1/Makefile.pre.in
|
|
|
aa4aef2 |
--- Python-3.1.1/Makefile.pre.in.no-static-lib 2010-01-17 15:42:11.945858717 -0500
|
|
|
aa4aef2 |
+++ Python-3.1.1/Makefile.pre.in 2010-01-17 16:44:32.788859363 -0500
|
|
|
aa4aef2 |
@@ -405,7 +405,7 @@ coverage:
|
|
|
aa4aef2 |
|
|
|
aa4aef2 |
|
|
|
aa4aef2 |
# Build the interpreter
|
|
|
aa4aef2 |
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
|
|
aa4aef2 |
+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
|
|
aa4aef2 |
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
|
aa4aef2 |
Modules/python.o \
|
|
|
aa4aef2 |
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
|
aa4aef2 |
@@ -421,18 +421,6 @@ sharedmods: $(BUILDPYTHON)
|
|
|
aa4aef2 |
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
|
|
aa4aef2 |
esac
|
|
|
aa4aef2 |
|
|
|
aa4aef2 |
-# Build static library
|
|
|
aa4aef2 |
-# avoid long command lines, same as LIBRARY_OBJS
|
|
|
aa4aef2 |
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
aa4aef2 |
- -rm -f $@
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
|
|
aa4aef2 |
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
|
|
aa4aef2 |
- $(RANLIB) $@
|
|
|
aa4aef2 |
-
|
|
|
aa4aef2 |
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
|
aa4aef2 |
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
|
|
aa4aef2 |
$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
|
|
aa4aef2 |
@@ -973,18 +961,6 @@ libainstall: all
|
|
|
aa4aef2 |
else true; \
|
|
|
aa4aef2 |
fi; \
|
|
|
aa4aef2 |
done
|
|
|
aa4aef2 |
- @if test -d $(LIBRARY); then :; else \
|
|
|
aa4aef2 |
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
|
|
aa4aef2 |
- if test "$(SO)" = .dll; then \
|
|
|
aa4aef2 |
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
|
aa4aef2 |
- else \
|
|
|
aa4aef2 |
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
aa4aef2 |
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
aa4aef2 |
- fi; \
|
|
|
aa4aef2 |
- else \
|
|
|
aa4aef2 |
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
|
aa4aef2 |
- fi; \
|
|
|
aa4aef2 |
- fi
|
|
|
aa4aef2 |
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
|
|
aa4aef2 |
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
|
aa4aef2 |
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|