Commit 75e33892 authored by Neil Schemenauer's avatar Neil Schemenauer

Simplify linking on BeOS. Rename some files. Closes SF patch #103679.

parent 1a020868
...@@ -106,6 +106,7 @@ LIBP= $(LIBDIR)/python$(VERSION) ...@@ -106,6 +106,7 @@ LIBP= $(LIBDIR)/python$(VERSION)
# Symbols used for using shared libraries # Symbols used for using shared libraries
SO= @SO@ SO= @SO@
LDSHARED= @LDSHARED@ LDSHARED= @LDSHARED@
BLDSHARED= @BLDSHARED@
DESTSHARED= $(BINLIBDEST)/lib-dynload DESTSHARED= $(BINLIBDEST)/lib-dynload
# Executable suffix (.exe on Windows and Mac OS X) # Executable suffix (.exe on Windows and Mac OS X)
...@@ -329,7 +330,7 @@ libpython$(VERSION).so: $(LIBRARY) ...@@ -329,7 +330,7 @@ libpython$(VERSION).so: $(LIBRARY)
/bin/rm -rf ./dgux \ /bin/rm -rf ./dgux \
;; \ ;; \
beos) \ beos) \
$(srcdir)/BeOS/ar-fake so $(LIBRARY) $@ \ $(AR) so $(LIBRARY) $@ \
;; \ ;; \
esac esac
...@@ -690,15 +691,13 @@ libainstall: all ...@@ -690,15 +691,13 @@ libainstall: all
fi fi
@case "$(MACHDEP)" in beos*) \ @case "$(MACHDEP)" in beos*) \
echo; echo "Installing support files for building shared extension modules on BeOS:"; \ echo; echo "Installing support files for building shared extension modules on BeOS:"; \
$(INSTALL_DATA) BeOS/README $(LIBPL)/README; \ $(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README; \
echo; echo "$(LIBPL)/README"; \ echo; echo "$(LIBPL)/README"; \
$(INSTALL_DATA) BeOS/README.readline-2.2 $(LIBPL)/README.readline-2.2; \ $(INSTALL_PROGRAM) Modules/ar_beos $(LIBPL)/ar_beos; \
echo "$(LIBPL)/README.readline-2.2"; \ echo "$(LIBPL)/ar_beos"; \
$(INSTALL_PROGRAM) BeOS/ar-fake $(LIBPL)/ar-fake; \ $(INSTALL_PROGRAM) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
echo "$(LIBPL)/ar-fake"; \ echo "$(LIBPL)/ld_so_beos"; \
$(INSTALL_PROGRAM) BeOS/linkmodule $(LIBPL)/linkmodule; \ echo; echo "See Misc/BeOS-NOTES for details."; \
echo "$(LIBPL)/linkmodule"; \
echo; echo "See BeOS/README for details."; \
;; \ ;; \
esac esac
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment