Mercurial > octave-nkf
changeset 2625:e2f1586bb393
[project @ 1997-01-26 04:50:52 by jwe]
| author | jwe |
|---|---|
| date | Sun, 26 Jan 1997 04:50:53 +0000 |
| parents | 7e24c1f29db4 |
| children | b35a5cd8107f |
| files | ChangeLog Makeconf.in configure.in mkoctfile.in octave-bug.in |
| diffstat | 5 files changed, 7 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 26 04:40:10 1997 +0000 +++ b/ChangeLog Sun Jan 26 04:50:53 1997 +0000 @@ -1,5 +1,10 @@ Sat Jan 25 22:27:14 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * configure.in (RLD_FLAG): Delete. + * mkoctfile.in (RLD_FLAG): Delete. + * octave-bug.in (RLD_FLAG): Delete. + * Makeconf.in (RLD_FLAG): Delete. + * Makefile.in (bin-dist): New target. * install-octave: Rename from doinstall.sh. Update for 2.x.
--- a/Makeconf.in Sun Jan 26 04:40:10 1997 +0000 +++ b/Makeconf.in Sun Jan 26 04:50:53 1997 +0000 @@ -114,8 +114,6 @@ ALL_LDFLAGS = $(LIBFLAGS) $(FORTRAN_MAIN_FLAG) $(GCC_IEEE_FP_FLAG) \ $(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS) -RLD_FLAG = @RLD_FLAG@ - FLIBS = @FLIBS@ CXXLIBS = @CXXLIBS@ @@ -335,7 +333,6 @@ -e "s;%GCC_IEEE_FP_FLAG%;\"${GCC_IEEE_FP_FLAG}\";" \ -e "s;%LDFLAGS%;\"${LDFLAGS}\";" \ -e "s;%LIBFLAGS%;\"-L${libdir}\";" \ - -e "s;%RLD_FLAG%;\"${RLD_FLAG}\";" \ -e "s;%CXXLIBS%;\"${CXXLIBS}\";" \ -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \ -e "s;%LIBS%;\"${LIBS}\";" \
--- a/configure.in Sun Jan 26 04:40:10 1997 +0000 +++ b/configure.in Sun Jan 26 04:50:53 1997 +0000 @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.246 $) +AC_REVISION($Revision: 1.247 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -380,18 +380,11 @@ CXXPICFLAG=-fPIC FPICFLAG=-fPIC SHLEXT=so -RLD_FLAG= case "$canonical_host_type" in alpha-dec-osf*) CPICFLAG= CXXPICFLAG= FPICFLAG= - RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' - ;; -changequote(,)dnl - i[3456789]86-*-linux*) -changequote([,])dnl - RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' ;; rs6000-ibm-aix* | powerpc-ibm-aix*) CPICFLAG= @@ -406,7 +399,6 @@ FPICFLAG=+Z fi SHLEXT=sl - RLD_FLAG='-Xlinker +b -Xlinker $(libdir)' ;; *-sgi-*) if $use_g77; then @@ -421,7 +413,6 @@ else FPICFLAG=-PIC fi - RLD_FLAG='-L$(libdir)' ;; sparc-sun-solaris2*) if $use_g77; then @@ -429,7 +420,6 @@ else FPICFLAG=-PIC fi - RLD_FLAG='-Xlinker -R -Xlinker $(libdir)' ;; esac AC_MSG_RESULT([defining FPICFLAG to be $FPICFLAG]) @@ -441,7 +431,6 @@ AC_SUBST(CPICFLAG) AC_SUBST(CXXPICFLAG) AC_SUBST(SHLEXT) -AC_SUBST(RLD_FLAG) AC_SUBST(DLFCN_DIR) ### Allow compilation of smaller kernel. This only works if some form
--- a/mkoctfile.in Sun Jan 26 04:40:10 1997 +0000 +++ b/mkoctfile.in Sun Jan 26 04:50:53 1997 +0000 @@ -29,7 +29,6 @@ LDFLAGS=%LDFLAGS% LIBFLAGS=%LIBFLAGS% -RLD_FLAG=%RLD_FLAG% FLIBS=%FLIBS% LIBS=%LIBS% LEXLIB=%LEXLIB% @@ -53,4 +52,4 @@ echo "making $octfile from $objfile" -$CXX -shared -o $octfile $objfile $LIBFLAGS $RLD_FLAG $OCTAVE_LIBS $FLIBS $LEXLIB $TERMLIBS $LIBS +$CXX -shared -o $octfile $objfile $LIBFLAGS $OCTAVE_LIBS $FLIBS $LEXLIB $TERMLIBS $LIBS
--- a/octave-bug.in Sun Jan 26 04:40:10 1997 +0000 +++ b/octave-bug.in Sun Jan 26 04:50:53 1997 +0000 @@ -34,7 +34,6 @@ CXXPICFLAG=%CXXPICFLAG% LDFLAGS=%LDFLAGS% LIBFLAGS=%LIBFLAGS% -RLD_FLAG=%RLD_FLAG% CXXLIBS=%CXXLIBS% TERMLIBS=%TERMLIBS% LIBS=%LIBS% @@ -168,7 +167,6 @@ CXXPICFLAG: $CXXPICFLAG LDFLAGS: $LDFLAGS LIBFLAGS: $LIBFLAGS -RLD_FLAG: $RLD_FLAG CXXLIBS: $CXXLIBS TERMLIBS: $TERMLIBS LIBS: $LIBS