Mercurial > jwe > octave
diff scripts/general/module.mk @ 23495:8308417aff1c
use automake %reldir% feature
* configure.ac (AM_INIT_AUTOMAKE): Require automake 1.14.
* doc/doxyhtml/module.mk, doc/interpreter/module.mk,
doc/liboctave/module.mk, doc/module.mk, doc/refcard/module.mk,
etc/module.mk, examples/module.mk, libgui/graphics/module.mk,
libgui/module.mk, libgui/src/module.mk, libinterp/corefcn/module.mk,
libinterp/dldfcn/config-module.awk, libinterp/module.mk,
libinterp/octave-value/module.mk, libinterp/operators/module.mk,
libinterp/parse-tree/module.mk, libinterp/template-inst/module.mk,
liboctave/array/module.mk, liboctave/external/Faddeeva/module.mk,
liboctave/external/amos/module.mk,
liboctave/external/blas-xtra/module.mk,
liboctave/external/daspk/module.mk,
liboctave/external/dasrt/module.mk,
liboctave/external/dassl/module.mk,
liboctave/external/fftpack/module.mk,
liboctave/external/lapack-xtra/module.mk,
liboctave/external/module.mk, liboctave/external/odepack/module.mk,
liboctave/external/ordered-qz/module.mk,
liboctave/external/quadpack/module.mk,
liboctave/external/ranlib/module.mk,
liboctave/external/slatec-err/module.mk,
liboctave/external/slatec-fn/module.mk, liboctave/module.mk,
liboctave/numeric/module.mk, liboctave/operators/module.mk,
liboctave/system/module.mk, liboctave/util/module.mk,
liboctave/wrappers/module.mk, m4/module.mk,
scripts/+containers/module.mk, scripts/@ftp/module.mk,
scripts/audio/module.mk, scripts/deprecated/module.mk,
scripts/elfun/module.mk, scripts/general/module.mk,
scripts/geometry/module.mk, scripts/gui/module.mk,
scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk,
scripts/java/module.mk, scripts/linear-algebra/module.mk,
scripts/miscellaneous/module.mk, scripts/module.mk,
scripts/ode/module.mk, scripts/optimization/module.mk,
scripts/path/module.mk, scripts/pkg/module.mk,
scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk,
scripts/plot/util/module.mk, scripts/polynomial/module.mk,
scripts/prefs/module.mk, scripts/profiler/module.mk,
scripts/set/module.mk, scripts/signal/module.mk,
scripts/sparse/module.mk, scripts/specfun/module.mk,
scripts/special-matrix/module.mk, scripts/startup/module.mk,
scripts/statistics/base/module.mk,
scripts/statistics/distributions/module.mk,
scripts/statistics/models/module.mk,
scripts/statistics/tests/module.mk, scripts/strings/module.mk,
scripts/testfun/module.mk, scripts/time/module.mk, src/module.mk,
test/bug-35448/module.mk, test/bug-36025/module.mk,
test/bug-38236/module.mk, test/bug-38691/module.mk,
test/bug-41723/module.mk, test/bug-44940/module.mk,
test/bug-46660/module.mk, test/bug-50014/module.mk,
test/bug-50035/module.mk, test/bug-50716/module.mk,
test/class-concat/module.mk,
test/classdef-multiple-inheritance/module.mk, test/classdef/module.mk,
test/classes/module.mk, test/ctor-vs-method/module.mk,
test/fcn-handle-derived-resolution/module.mk, test/module.mk,
test/nest/module.mk, test/publish/module.mk:
Use %reldir% and %canon_reldir% where possible.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 15 May 2017 16:17:58 -0400 |
| parents | 9baa19102908 |
| children | c3043aaad700 |
line wrap: on
line diff
--- a/scripts/general/module.mk Mon May 15 16:09:35 2017 +0100 +++ b/scripts/general/module.mk Mon May 15 16:17:58 2017 -0400 @@ -1,100 +1,100 @@ FCN_FILE_DIRS += \ scripts/general \ - scripts/general/private + %reldir%/private -scripts_general_PRIVATE_FCN_FILES = \ - scripts/general/private/__isequal__.m \ - scripts/general/private/__publish_html_output__.m \ - scripts/general/private/__publish_latex_output__.m \ - scripts/general/private/__splinen__.m +%canon_reldir%_PRIVATE_FCN_FILES = \ + %reldir%/private/__isequal__.m \ + %reldir%/private/__publish_html_output__.m \ + %reldir%/private/__publish_latex_output__.m \ + %reldir%/private/__splinen__.m -scripts_general_FCN_FILES = \ - scripts/general/accumarray.m \ - scripts/general/accumdim.m \ - scripts/general/bincoeff.m \ - scripts/general/bitcmp.m \ - scripts/general/bitget.m \ - scripts/general/bitset.m \ - scripts/general/blkdiag.m \ - scripts/general/cart2pol.m \ - scripts/general/cart2sph.m \ - scripts/general/cell2mat.m \ - scripts/general/celldisp.m \ - scripts/general/chop.m \ - scripts/general/circshift.m \ - scripts/general/common_size.m \ - scripts/general/cplxpair.m \ - scripts/general/cumtrapz.m \ - scripts/general/curl.m \ - scripts/general/dblquad.m \ - scripts/general/deal.m \ - scripts/general/deg2rad.m \ - scripts/general/del2.m \ - scripts/general/divergence.m \ - scripts/general/fieldnames.m \ - scripts/general/flip.m \ - scripts/general/flipdim.m \ - scripts/general/fliplr.m \ - scripts/general/flipud.m \ - scripts/general/grabcode.m \ - scripts/general/gradient.m \ - scripts/general/idivide.m \ - scripts/general/inputParser.m \ - scripts/general/int2str.m \ - scripts/general/interp1.m \ - scripts/general/interp2.m \ - scripts/general/interp3.m \ - scripts/general/interpft.m \ - scripts/general/interpn.m \ - scripts/general/isdir.m \ - scripts/general/isequal.m \ - scripts/general/isequaln.m \ - scripts/general/loadobj.m \ - scripts/general/logspace.m \ - scripts/general/methods.m \ - scripts/general/nargchk.m \ - scripts/general/narginchk.m \ - scripts/general/nargoutchk.m \ - scripts/general/nextpow2.m \ - scripts/general/nthargout.m \ - scripts/general/num2str.m \ - scripts/general/pol2cart.m \ - scripts/general/polyarea.m \ - scripts/general/postpad.m \ - scripts/general/prepad.m \ - scripts/general/publish.m \ - scripts/general/quadgk.m \ - scripts/general/quadl.m \ - scripts/general/quadv.m \ - scripts/general/rad2deg.m \ - scripts/general/randi.m \ - scripts/general/rat.m \ - scripts/general/repmat.m \ - scripts/general/rot90.m \ - scripts/general/rotdim.m \ - scripts/general/saveobj.m \ - scripts/general/shift.m \ - scripts/general/shiftdim.m \ - scripts/general/sortrows.m \ - scripts/general/sph2cart.m \ - scripts/general/structfun.m \ - scripts/general/subsindex.m \ - scripts/general/trapz.m \ - scripts/general/triplequad.m \ - scripts/general/validateattributes.m +%canon_reldir%_FCN_FILES = \ + %reldir%/accumarray.m \ + %reldir%/accumdim.m \ + %reldir%/bincoeff.m \ + %reldir%/bitcmp.m \ + %reldir%/bitget.m \ + %reldir%/bitset.m \ + %reldir%/blkdiag.m \ + %reldir%/cart2pol.m \ + %reldir%/cart2sph.m \ + %reldir%/cell2mat.m \ + %reldir%/celldisp.m \ + %reldir%/chop.m \ + %reldir%/circshift.m \ + %reldir%/common_size.m \ + %reldir%/cplxpair.m \ + %reldir%/cumtrapz.m \ + %reldir%/curl.m \ + %reldir%/dblquad.m \ + %reldir%/deal.m \ + %reldir%/deg2rad.m \ + %reldir%/del2.m \ + %reldir%/divergence.m \ + %reldir%/fieldnames.m \ + %reldir%/flip.m \ + %reldir%/flipdim.m \ + %reldir%/fliplr.m \ + %reldir%/flipud.m \ + %reldir%/grabcode.m \ + %reldir%/gradient.m \ + %reldir%/idivide.m \ + %reldir%/inputParser.m \ + %reldir%/int2str.m \ + %reldir%/interp1.m \ + %reldir%/interp2.m \ + %reldir%/interp3.m \ + %reldir%/interpft.m \ + %reldir%/interpn.m \ + %reldir%/isdir.m \ + %reldir%/isequal.m \ + %reldir%/isequaln.m \ + %reldir%/loadobj.m \ + %reldir%/logspace.m \ + %reldir%/methods.m \ + %reldir%/nargchk.m \ + %reldir%/narginchk.m \ + %reldir%/nargoutchk.m \ + %reldir%/nextpow2.m \ + %reldir%/nthargout.m \ + %reldir%/num2str.m \ + %reldir%/pol2cart.m \ + %reldir%/polyarea.m \ + %reldir%/postpad.m \ + %reldir%/prepad.m \ + %reldir%/publish.m \ + %reldir%/quadgk.m \ + %reldir%/quadl.m \ + %reldir%/quadv.m \ + %reldir%/rad2deg.m \ + %reldir%/randi.m \ + %reldir%/rat.m \ + %reldir%/repmat.m \ + %reldir%/rot90.m \ + %reldir%/rotdim.m \ + %reldir%/saveobj.m \ + %reldir%/shift.m \ + %reldir%/shiftdim.m \ + %reldir%/sortrows.m \ + %reldir%/sph2cart.m \ + %reldir%/structfun.m \ + %reldir%/subsindex.m \ + %reldir%/trapz.m \ + %reldir%/triplequad.m \ + %reldir%/validateattributes.m -scripts_generaldir = $(fcnfiledir)/general +%canon_reldir%dir = $(fcnfiledir)/general -scripts_general_DATA = $(scripts_general_FCN_FILES) +%canon_reldir%_DATA = $(%canon_reldir%_FCN_FILES) -scripts_general_privatedir = $(fcnfiledir)/general/private +%canon_reldir%_privatedir = $(fcnfiledir)/general/private -scripts_general_private_DATA = $(scripts_general_PRIVATE_FCN_FILES) +%canon_reldir%_private_DATA = $(%canon_reldir%_PRIVATE_FCN_FILES) FCN_FILES += \ - $(scripts_general_FCN_FILES) \ - $(scripts_general_PRIVATE_FCN_FILES) + $(%canon_reldir%_FCN_FILES) \ + $(%canon_reldir%_PRIVATE_FCN_FILES) -PKG_ADD_FILES += scripts/general/PKG_ADD +PKG_ADD_FILES += %reldir%/PKG_ADD -DIRSTAMP_FILES += scripts/general/$(octave_dirstamp) +DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)