Mercurial > hg > octave-terminal
changeset 3036:b8c5ded2751f
[project @ 1997-06-05 21:44:19 by jwe]
author | jwe |
---|---|
date | Thu, 05 Jun 1997 21:44:49 +0000 |
parents | 882b6ea36be6 |
children | fe3b1f95a2c9 |
files | ChangeLog Makeconf.in configure.in libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in |
diffstat | 9 files changed, 31 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Thu Jun 5 01:38:04 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * configure.in (SONAME_FLAGS): Define for some systems. + * Makeconf.in: Substitute value here. + * Makeconf.in (STATIC_LIBS): New variable. * configure.in: Handle --enable-static.
--- a/Makeconf.in +++ b/Makeconf.in @@ -130,6 +130,8 @@ SH_LD = @SH_LD@ SH_LDFLAGS = @SH_LDFLAGS@ +SONAME_FLAGS = @SONAME_FLAGS@ + RLD_FLAG = @RLD_FLAG@ FLIBS = @FLIBS@
--- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.274 $) +AC_REVISION($Revision: 1.275 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -574,6 +574,7 @@ SHLEXT=so SH_LD="$CC" SH_LDFLAGS=-shared +SONAME_FLAGS= RLD_FLAG= case "$canonical_host_type" in *-*-386bsd* | *-*-openbsd* | *-*-netbsd* | *-*-freebsd*) @@ -585,11 +586,13 @@ CXXPICFLAG= FPICFLAG= SH_LDFLAGS="-shared -Xlinker -expect_unresolved -Xlinker '*'" + SONAME_FLAGS="-Xlinker -soname -Xlinker $@" RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' ;; changequote(,)dnl i[3456789]86-*-linux*) changequote([,])dnl + SONAME_FLAGS="-Xlinker -soname -Xlinker $@" RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' ;; rs6000-ibm-aix* | powerpc-ibm-aix*) @@ -644,6 +647,7 @@ AC_MSG_RESULT([defining DLFCN_DIR to be $DLFCN_DIR]) AC_MSG_RESULT([defining SH_LD to be $SH_LD]) AC_MSG_RESULT([defining SH_LDFLAGS to be $SH_LDFLAGS]) +AC_MSG_RESULT([defining SONAME_FLAGS to be $SONAME_FLAGS]) AC_MSG_RESULT([defining RLD_FLAG to be $RLD_FLAG]) AC_SUBST(FPICFLAG) AC_SUBST(CPICFLAG) @@ -652,6 +656,7 @@ AC_SUBST(DLFCN_DIR) AC_SUBST(SH_LD) AC_SUBST(SH_LDFLAGS) +AC_SUBST(SONAME_FLAGS) AC_SUBST(RLD_FLAG) ### Allow compilation of smaller kernel. This only works if some form
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,6 +1,7 @@ Thu Jun 5 01:40:36 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in, Makerules.in: Make building of static library optional. + (liboctave.$(SHLEXT_VER)): Add $(SONAME_FLAGS) to command. * Makerules.in (stamp-picdir): Delete. (pic): New target. Don't worry so much about creating pic
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -76,11 +76,11 @@ .PHONY: shared-lib libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER) - rm -f libcruft.$(SHLEXT) - $(LN_S) libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT) + rm -f $! + $(LN_S) $< $@ libcruft.$(SHLEXT_VER): $(CRUFT_PICOBJ) - $(SH_LD) $(SH_LDFLAGS) -o $@ $(CRUFT_PICOBJ) + $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $* $(CRUFT_OBJ):
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,6 +1,7 @@ Thu Jun 5 01:44:43 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in: Make building of static library optional. + (liboctave.$(SHLEXT_VER)): Add $(SONAME_FLAGS) to command. * Makefile.in (stamp-picdir): Delete. (pic): New target. Don't worry so much about creating pic
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -147,15 +147,15 @@ .PHONY: libraries liboctave.$(LIBEXT): $(OBJECTS) - $(AR) $(ARFLAGS) liboctave.$(LIBEXT) $(OBJECTS) - $(RANLIB) liboctave.$(LIBEXT) + $(AR) $(ARFLAGS) $@ $* + $(RANLIB) $@ liboctave.$(SHLEXT): liboctave.$(SHLEXT_VER) - rm -f liboctave.$(SHLEXT) - $(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT) + rm -f $@ + $(LN_S) $< $@ -liboctave.$(SHLEXT_VER): stamp-prereq $(PICOBJ) - $(SH_LD) $(SH_LDFLAGS) -o $@ $(PICOBJ) +liboctave.$(SHLEXT_VER): $(PICOBJ) + $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $* extract_stat = sed 's/@l@//g; s/@L@//g; /@LSTAT_ONLY@/d' extract_lstat = sed 's/@l@/l/g; s/@L@/L/g; s/ *@LSTAT_ONLY@//'
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ Thu Jun 5 01:42:39 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in: Make building of static library optional. + (liboctave.$(SHLEXT_VER)): Add $(SONAME_FLAGS) to command. * dynamic-ld.cc (octave_shl_load_dynamic_loader::resolve_reference): Call shl_findsym with type set to TYPE_UNDEFINED.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -187,7 +187,7 @@ BINDISTFILES = octave $(OCT_FILES) endif -all: libraries stamp-oct-links octave +all: stamp-prereq libraries stamp-oct-links octave .PHONY: all stamp-oct-links: $(OCT_FILES) @@ -229,16 +229,16 @@ endif .PHONY: libraries -liboctinterp.$(LIBEXT): stamp-prereq $(OBJECTS) - $(AR) $(ARFLAGS) liboctinterp.$(LIBEXT) $(OBJECTS) - $(RANLIB) liboctinterp.$(LIBEXT) +liboctinterp.$(LIBEXT): $(OBJECTS) + $(AR) $(ARFLAGS) $@ $* + $(RANLIB) $@ liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER) - rm -f liboctinterp.$(SHLEXT) - $(LN_S) liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT) + rm -f $@ + $(LN_S) $< $@ -liboctinterp.$(SHLEXT_VER): stamp-prereq $(PICOBJ) - $(SH_LD) $(SH_LDFLAGS) -o $@ $(PICOBJ) +liboctinterp.$(SHLEXT_VER): $(PICOBJ) + $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $* builtins.cc: $(DEF_FILES) mkbuiltins @echo making $@