Mercurial > octave-antonio
diff liboctave/cruft/misc/module.mk @ 19124:3087dc835497
eliminate recursive build in liboctave/cruft directory
* liboctave/cruft/module.mk: New file, adapted from Makefile.am.
* liboctave/cruft/Makefile.am: Delete.
* configure.ac (AC_OUTPUT): Don't generate liboctave/cruft/Makefile.
* liboctave/array/module.mk, liboctave/numeric/module.mk,
liboctave/operators/module.mk, liboctave/system/module.mk,
liboctave/util/module.mk: Append convenience library name to
liboctave_la_LIBADD here.
* liboctave/Makefile.am: Initialize liboctave_la_LIBADD to empty
string here.
* liboctave/cruft/Faddeeva/module.mk, liboctave/cruft/amos/module.mk,
liboctave/cruft/blas-xtra/module.mk, liboctave/cruft/daspk/module.mk,
liboctave/cruft/dasrt/module.mk, liboctave/cruft/dassl/module.mk,
liboctave/cruft/fftpack/module.mk,
liboctave/cruft/lapack-xtra/module.mk, liboctave/cruft/misc/module.mk,
liboctave/cruft/odepack/module.mk,
liboctave/cruft/ordered-qz/module.mk,
liboctave/cruft/quadpack/module.mk, liboctave/cruft/ranlib/module.mk,
liboctave/cruft/slatec-err/module.mk,
liboctave/cruft/slatec-fn/module.mk: Adapt for non-recursive build.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 21 Sep 2014 10:51:38 -0400 |
parents | 648dabbb4c6b |
children | 0e1f5a750d00 |
line wrap: on
line diff
--- a/liboctave/cruft/misc/module.mk Sat Sep 20 22:04:01 2014 -0700 +++ b/liboctave/cruft/misc/module.mk Sun Sep 21 10:51:38 2014 -0400 @@ -1,19 +1,19 @@ EXTRA_DIST += \ - misc/module.mk \ - misc/d1mach-tst.for + cruft/misc/module.mk \ + cruft/misc/d1mach-tst.for -libcruft_la_SOURCES += \ - misc/blaswrap.c \ - misc/cquit.c \ - misc/d1mach.f \ - misc/f77-extern.cc \ - misc/f77-fcn.c \ - misc/i1mach.f \ - misc/lo-error.c \ - misc/quit.cc \ - misc/r1mach.f +CRUFT_SOURCES += \ + cruft/misc/blaswrap.c \ + cruft/misc/cquit.c \ + cruft/misc/d1mach.f \ + cruft/misc/f77-extern.cc \ + cruft/misc/f77-fcn.c \ + cruft/misc/i1mach.f \ + cruft/misc/lo-error.c \ + cruft/misc/quit.cc \ + cruft/misc/r1mach.f -octinclude_HEADERS += \ - misc/f77-fcn.h \ - misc/lo-error.h \ - misc/quit.h +CRUFT_INC += \ + cruft/misc/f77-fcn.h \ + cruft/misc/lo-error.h \ + cruft/misc/quit.h