Mercurial > hg > octave-nkf
changeset 4103:677c5f3a15be
[project @ 2002-10-14 21:20:48 by jwe]
author | jwe |
---|---|
date | Mon, 14 Oct 2002 21:20:49 +0000 |
parents | cbac6756967e |
children | fef735180134 |
files | ChangeLog configure.in liboctave/Makefile.in src/Makefile.in |
diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-10-14 John W. Eaton <jwe@bevo.che.wisc.edu> + * configure.in (SH_LDFLAGS): Additional options for Cygwin: + -Wl,--export-all-symbols -Wl,--enable-auto-import + -Wl,--allow-multiple-definition. + * Makeconf.in (TERMLIBS): Substitute here. * configure.in: Define OCTAVE_USE_WINDOWS_API if
--- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.376 $) +AC_REVISION($Revision: 1.377 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -664,7 +664,7 @@ SHLEXT=dll SHLLIB=dll.a SHLBIN=dll - SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import" + SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--allow-multiple-definition" SHLLINKEXT=.dll SONAME_FLAGS='-Wl,--out-implib=$@.a' INCLUDE_LINK_DEPS=true
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -264,7 +264,11 @@ $(top_srcdir)/mkinstalldirs $(octincludedir)/octave for f in $(INCLUDES_FOR_INSTALL); do \ rm -f $(octincludedir)/octave/$$f; \ - $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \ + if [ -f $$f ]; then \ + $(INSTALL_DATA) $$f $(octincludedir)/octave/$$f; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \ + fi ; \ done .PHONY: install-inc
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -382,7 +382,7 @@ if test x$(SHLBIN) != x ; then \ rm -f $(bindir)/liboctinterp.$(SHLBIN_VER); \ $(INSTALL_PROGRAM) \ - liboctinterp.$(SHLBIN) $(bindir)/octinterp.$(SHLBIN_VER); \ + liboctinterp.$(SHLBIN) $(bindir)/liboctinterp.$(SHLBIN_VER); \ rm -f $(bindir)/liboctinterp.$(SHLBIN); \ $(LN_S) liboctinterp.$(SHLBIN_VER) $(bindir)/liboctinterp.$(SHLBIN); \ fi; \