# HG changeset patch # User jwe # Date 1076805150 0 # Node ID 8ece12f60ba2a2c978630d49f5f0fea223d56db3 # Parent 364bbf35dbfadd332866e26bb145f5b271cbc1ba [project @ 2004-02-15 00:32:30 by jwe] diff -r 364bbf35dbfa -r 8ece12f60ba2 ChangeLog --- a/ChangeLog Sun Feb 15 00:08:07 2004 +0000 +++ b/ChangeLog Sun Feb 15 00:32:30 2004 +0000 @@ -1,5 +1,13 @@ 2004-02-14 John W. Eaton + * mkoctfile.in: Delete INCLUDE_LINK_DEPS. Fix help text. + Always define LINK_DEPS. + (LINK_DEPS): Also include FLIBS in the list. + + * Makeconf.in (INCLUDE_LINK_DEPS): Don't substitute. + (do-subst-config-vals): Delete INCLUDE_LINK_DEPS. + * configure.in (INCLUDE_LINK_DEPS): Delete. + * mkoctfile (SH_LD, SH_LDFLAGS): Delete. (DL_LD, DL_LDFLAGS): New variables. Use them instead of SH_LD and SH_LDFLAGS for creating .oct files. diff -r 364bbf35dbfa -r 8ece12f60ba2 Makeconf.in --- a/Makeconf.in Sun Feb 15 00:08:07 2004 +0000 +++ b/Makeconf.in Sun Feb 15 00:32:30 2004 +0000 @@ -71,8 +71,6 @@ SHLBIN_VER = @SHLBIN_VER@ SHLLINKEXT= -INCLUDE_LINK_DEPS = @INCLUDE_LINK_DEPS@ - LIBEXT = a # Fortran to C translator and associated flags. @@ -424,7 +422,6 @@ -e "s;%OCTAVE_CONF_FPICFLAG%;\"${FPICFLAG}\";" \ -e "s;%OCTAVE_CONF_GLOB_INCFLAGS%;\"${GLOB_INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_INCFLAGS%;\"${INCFLAGS}\";" \ - -e "s;%OCTAVE_CONF_INCLUDE_LINK_DEPS%;\"${INCLUDE_LINK_DEPS}\";"\ -e "s;%OCTAVE_CONF_LD_CXX%;\"${LD_CXX}\";" \ -e "s;%OCTAVE_CONF_LDFLAGS%;\"${LDFLAGS}\";" \ -e "s;%OCTAVE_CONF_LD_STATIC_FLAG%;\"${LD_STATIC_FLAG}\";" \ diff -r 364bbf35dbfa -r 8ece12f60ba2 configure.in --- a/configure.in Sun Feb 15 00:08:07 2004 +0000 +++ b/configure.in Sun Feb 15 00:32:30 2004 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.444 $) +AC_REVISION($Revision: 1.445 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -671,7 +671,6 @@ SONAME_FLAGS= RLD_FLAG= NO_OCT_FILE_STRIP=false -INCLUDE_LINK_DEPS=false TEMPLATE_AR='$(AR)' TEMPLATE_ARFLAGS="$ARFLAGS" library_path_var=LD_LIBRARY_PATH @@ -702,7 +701,6 @@ SHLLIB='$(SHLEXT)' SHLEXT_VER='$(version).$(SHLEXT)' SHLLIB_VER='$(version).$(SHLLIB)' - INCLUDE_LINK_DEPS=true NO_OCT_FILE_STRIP=true library_path_var=DYLD_LIBRARY_PATH ;; @@ -716,7 +714,6 @@ SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import" SHLLINKEXT=.dll SONAME_FLAGS='-Wl,--out-implib=$@.a' - INCLUDE_LINK_DEPS=true library_path_var=PATH ;; *-*-linux* | *-*-gnu*) @@ -818,7 +815,6 @@ AC_MSG_RESULT([defining RLD_FLAG to be $RLD_FLAG]) AC_MSG_RESULT([defining TEMPLATE_AR to be $TEMPLATE_AR]) AC_MSG_RESULT([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) -AC_MSG_RESULT([defining INCLUDE_LINK_DEPS to be $INCLUDE_LINK_DEPS]) AC_MSG_RESULT([defining library_path_var to be $library_path_var]) AC_SUBST(FPICFLAG) AC_SUBST(CPICFLAG) @@ -841,7 +837,6 @@ AC_SUBST(RLD_FLAG) AC_SUBST(TEMPLATE_AR) AC_SUBST(TEMPLATE_ARFLAGS) -AC_SUBST(INCLUDE_LINK_DEPS) AC_SUBST(library_path_var) ### special checks for odd OS specific things. diff -r 364bbf35dbfa -r 8ece12f60ba2 libcruft/ChangeLog --- a/libcruft/ChangeLog Sun Feb 15 00:08:07 2004 +0000 +++ b/libcruft/ChangeLog Sun Feb 15 00:32:30 2004 +0000 @@ -1,3 +1,7 @@ +2004-02-14 John W. Eaton + + * Makefile.in (LINK_DEPS): Always define. + 2003-11-12 John Eaton * misc/machar.c (machar) [CRAY]: Kluge to make it work. diff -r 364bbf35dbfa -r 8ece12f60ba2 libcruft/Makefile.in --- a/libcruft/Makefile.in Sun Feb 15 00:08:07 2004 +0000 +++ b/libcruft/Makefile.in Sun Feb 15 00:32:30 2004 +0000 @@ -47,9 +47,7 @@ endif # include BLAS and FFTW just in case some of libcruft depends on them -ifeq ($(INCLUDE_LINK_DEPS),true) - LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) -endif +LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) all: libraries .PHONY: all diff -r 364bbf35dbfa -r 8ece12f60ba2 liboctave/ChangeLog --- a/liboctave/ChangeLog Sun Feb 15 00:08:07 2004 +0000 +++ b/liboctave/ChangeLog Sun Feb 15 00:32:30 2004 +0000 @@ -1,5 +1,7 @@ 2004-02-14 John W. Eaton + * Makefile.in (LINK_DEPS): Always define. + * Array.cc (Array::squeeze): Always return an array with at least two dimensions. diff -r 364bbf35dbfa -r 8ece12f60ba2 liboctave/Makefile.in --- a/liboctave/Makefile.in Sun Feb 15 00:08:07 2004 +0000 +++ b/liboctave/Makefile.in Sun Feb 15 00:32:30 2004 +0000 @@ -18,12 +18,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -ifeq ($(INCLUDE_LINK_DEPS), true) - LINK_DEPS = \ - -L../libcruft -L../glob -L. $(RLD_FLAG) \ - $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) \ - -lglob $(LIBS) $(FLIBS) -endif +LINK_DEPS = \ + -L../libcruft -L../glob -L. $(RLD_FLAG) \ + $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) -lglob $(LIBS) $(FLIBS) MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h \ Array-flags.h Array-util.h ArrayN-idx.h MArray-defs.h \ diff -r 364bbf35dbfa -r 8ece12f60ba2 mkoctfile.in --- a/mkoctfile.in Sun Feb 15 00:08:07 2004 +0000 +++ b/mkoctfile.in Sun Feb 15 00:32:30 2004 +0000 @@ -48,7 +48,6 @@ : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%} : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%} : ${LFLAGS=%OCTAVE_CONF_MKOCTFILE_LFLAGS%} -: ${INCLUDE_LINK_DEPS=%OCTAVE_CONF_INCLUDE_LINK_DEPS%} : ${ALL_FFLAGS="$FFLAGS"} @@ -146,8 +145,6 @@ CC DL_LD CFLAGS DL_LDFLAGS - INCLUDE_LINK_DEPS - LD_CXX LFLAGS LDFLAGS LD_STATIC_FLAG RLD_FLAG RDYNAMIC_FLAG @@ -386,10 +383,7 @@ exit 1 fi else - LINK_DEPS= - if $INCLUDE_LINK_DEPS ; then - LINK_DEPS="$LFLAGS $LIBOCTAVE $LIBCRUFT $LIBOCTINTERP $BLAS_LIBS $FFTW_LIBS" - fi + LINK_DEPS="$LFLAGS $LIBOCTAVE $LIBCRUFT $LIBOCTINTERP $BLAS_LIBS $FFTW_LIBS $FLIBS" cmd="$DL_LD $DL_LDFLAGS -o $octfile $objfiles $ldflags $LINK_DEPS" $dbg $cmd eval $cmd diff -r 364bbf35dbfa -r 8ece12f60ba2 src/ChangeLog --- a/src/ChangeLog Sun Feb 15 00:08:07 2004 +0000 +++ b/src/ChangeLog Sun Feb 15 00:32:30 2004 +0000 @@ -1,5 +1,7 @@ 2004-02-14 John W. Eaton + * Makefile.in (OCTINTERP_LINK_DEPS, OCT_LINK_DEPS): Always define. + * oct-conf.h.in: Add OCTAVE_CONF_DL_LD, OCTAVE_CONF_DL_LDFLAGS, and OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS. Delete OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS. diff -r 364bbf35dbfa -r 8ece12f60ba2 src/Makefile.in --- a/src/Makefile.in Sun Feb 15 00:08:07 2004 +0000 +++ b/src/Makefile.in Sun Feb 15 00:32:30 2004 +0000 @@ -194,13 +194,12 @@ $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ $(LIBPLPLOT) $(LIBGLOB) $(LIBDLFCN) -ifeq ($(INCLUDE_LINK_DEPS),true) - OCTINTERP_LINK_DEPS = \ - -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(FLIBS) - OCT_LINK_DEPS = \ - -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ - -L. $(LIBOCTINTERP) $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) -endif +OCTINTERP_LINK_DEPS = \ + -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(FLIBS) + +OCT_LINK_DEPS = \ + -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ + -L. $(LIBOCTINTERP) $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \ DOCSTRINGS mkbuiltins mk-oct-links \