Mercurial > hg > octave-avbm
changeset 9617:7c628fb04fd0
Makeconf.in: don't sort sparse and fftw cpp/ld flags
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 04 Sep 2009 17:57:46 -0400 |
parents | 2093499ec9f4 |
children | e381f80a5f7a |
files | ChangeLog Makeconf.in |
diffstat | 2 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-04 John W. Eaton <jwe@octave.org> + + * Makeconf.in (SPARSE_CPPFLAGS, SPARSE_LDFLAGS, FFTW_CPPFLAGS, + FFTW_LDFLAGS): Don't sort lists. + 2009-09-02 Marco Atzeri <marco_atzeri@yahoo.it> * Makeconf.in: Order SPARSE_LIBS so linking succeeds on Cygwin.
--- a/Makeconf.in +++ b/Makeconf.in @@ -308,17 +308,15 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(HDF5_CPPFLAGS) $(Z_CPPFLAGS) -## Use sort to remove duplicates. SPARSE_CPPFLAGS = \ - $(sort $(AMD_CPPFLAGS) $(CAMD_CPPFLAGS) $(COLAMD_CPPFLAGS) \ - $(CCOLAMD_CPPFLAGS) $(CHOLMOD_CPPFLAGS) $(CXSPARSE_CPPFLAGS) \ - $(UMFPACK_CPPFLAGS)) + $(CHOLMOD_CPPFLAGS) $(UMFPACK_CPPFLAGS) \ + $(AMD_CPPFLAGS) $(CAMD_CPPFLAGS) $(COLAMD_CPPFLAGS) \ + $(CCOLAMD_CPPFLAGS) $(CXSPARSE_CPPFLAGS) -## Use sort to remove duplicates. SPARSE_LDFLAGS = \ - $(sort $(AMD_LDFLAGS) $(CAMD_LDFLAGS) $(COLAMD_LDFLAGS) \ - $(CCOLAMD_LDFLAGS) $(CHOLMOD_LDFLAGS) $(CXSPARSE_LDFLAGS) \ - $(UMFPACK_LDFLAGS)) + $(CHOLMOD_LDFLAGS) $(UMFPACK_LDFLAGS) \ + $(AMD_LDFLAGS) $(CAMD_LDFLAGS) $(COLAMD_LDFLAGS) \ + $(CCOLAMD_LDFLAGS) $(CXSPARSE_LDFLAGS) ## Order matters, at least on some systems (Cygwin, for example). SPARSE_LIBS = \ @@ -326,11 +324,9 @@ $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \ $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) -## Use sort to remove duplicates. -FFTW_CPPFLAGS = $(sort $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS)) +FFTW_CPPFLAGS = $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS) -## Use sort to remove duplicates. -FFTW_LDFLAGS = $(sort $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)) +FFTW_LDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS) FFTW_LIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)