Mercurial > hg > octave-lojdl
changeset 9490:3aeb7d881578
clean up linker options
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 05 Aug 2009 16:11:06 -0400 |
parents | fe8890c11b12 |
children | ac5e381f7a1c |
files | libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in |
diffstat | 6 files changed, 30 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +2009-08-05 John W. Eaton <jwe@octave.org> + + * Makefile.in (LINK_DEPS): Omit $(FFTW_LIBS) from the list. + 2009-06-22 John W. Eaton <jwe@octave.org> * Makefile.in (MISC_OBJ): Remove misc/machar.o and misc/smachar.o
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -58,8 +58,7 @@ XTRA_CRUFT_SH_LDFLAGS = @XTRA_CRUFT_SH_LDFLAGS@ SH_LDFLAGS += $(XTRA_CRUFT_SH_LDFLAGS) -# Include BLAS and FFTW just in case some of libcruft depends on them -LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) +LINK_DEPS = $(BLAS_LIBS) $(FLIBS) all: libraries .PHONY: all
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2009-08-05 John W. Eaton <jwe@octave.org> + + * Makefile.in (LINK_DEPS): Omit $(BLAS_LIBS) from the list. + Include $(RLD_FLAG) in the list. + 2009-08-05 John W. Eaton <jwe@octave.org> * Makefile.in (LINK_DEPS): Include $(PTHREAD_LIBS) in the list.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -35,10 +35,11 @@ DLL_CXXDEFS = @OCTAVE_DLL_DEFS@ LINK_DEPS = \ - -L../libcruft -L. $(RLD_FLAG) \ - $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \ + $(RLD_FLAG) \ + -L../libcruft $(LIBCRUFT) \ + $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \ $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(ARPACK_LIBS) \ - $(QRUPDATE_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) \ + $(QRUPDATE_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) \ $(REGEX_LIBS) $(LIBS) $(FLIBS) $(PTHREAD_LIBS) MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-08-05 John W. Eaton <jwe@octave.org> + + * Makefile.in (octave$(EXEEXT)): Clean up link flags and library list. + (OCTINTERP_LINK_DEPS): Omit -L../libcruft $(LIBCRUFT) $(LIBS) + $(FLIBS) from the list. Include $(RLD_FLAG) in the list. + (OCT_LINK_DEPS): Only include -L. $(LIBOCTINTERP) in the list. + 2009-08-05 Jaroslav Hajek <highegg@gmail.com> * utils.cc (Fisindex): New DEFUN.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -285,28 +285,20 @@ DOC_FILES := $(sort $(DEF_FILES)) -OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave -L$(TOPDIR)/libcruft \ - -L$(TOPDIR)/src $(RLD_FLAG) - ifeq ($(ENABLE_DYNAMIC_LINKING), true) - OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) \ - $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ - $(LIBPLPLOT) $(LIBGLOB) + OCTAVE_LIBS = $(LIBOCTINTERP) else OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(QHULL_LIBS) \ - $(GLPK_LIBS) $(MAGICK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ + $(GLPK_LIBS) $(MAGICK_LIBS) $(REGEX_LIBS) $(LIBCRUFT) \ $(LIBPLPLOT) $(LIBGLOB) endif OCTINTERP_LINK_DEPS = \ - -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) \ + $(RLD_FLAG) \ + -L../liboctave $(LIBOCTAVE) \ $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) -OCT_LINK_DEPS = \ - -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ - -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ - $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ - $(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(LIBS) $(FLIBS) +OCT_LINK_DEPS = -L. $(LIBOCTINTERP) BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \ $(OPT_HANDLERS) $(BUILT_EXTRAS) @@ -371,14 +363,10 @@ octave$(EXEEXT): $(LIBRARIES) main.o $(DLD_STATIC_OBJ) $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ - $(ALL_LDFLAGS) -o $@ \ - main.o $(DLD_STATIC_OBJ) \ - $(OCTAVE_LFLAGS) \ - $(OCTAVE_LIBS) \ - $(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \ - $(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ - $(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(OPENGL_LIBS) \ - $(X11_LIBS) $(CARBON_LIBS) $(LIBS) $(FLIBS) + $(ALL_LDFLAGS) -o $@ main.o $(DLD_STATIC_OBJ) \ + $(RLD_FLAG) \ + -L. $(LIBOCTINTERP) -L../liboctave $(LIBOCTAVE) \ + -L../libcruft $(LIBCRUFT) stmp-pic: pic @if [ -f stmp-pic ]; then \