# HG changeset patch # User John W. Eaton # Date 1591305014 14400 # Node ID 2aa43d1c8c0da4f7a9e33df454817fdad132975b # Parent 09a3c0e91e6e6c75bb7b577510f44950d58dcfb5 use separate module.mk files for examples/code and examples/data directories * examples/code/module.mk, examples/code/module.mk: New files with entries extracted from examples/module.mk. * examples/module.mk: Update. diff -r 09a3c0e91e6e -r 2aa43d1c8c0d examples/code/module.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/code/module.mk Thu Jun 04 17:10:14 2020 -0400 @@ -0,0 +1,75 @@ +%canon_reldir%_EXTRA_DIST = + +%canon_reldir%_CLEANFILES = +%canon_reldir%_DISTCLEANFILES = +%canon_reldir%_MAINTAINERCLEANFILES = + +%canon_reldir%_SRC = \ + %reldir%/@FIRfilter/FIRfilter.m \ + %reldir%/@FIRfilter/FIRfilter_aggregation.m \ + %reldir%/@FIRfilter/display.m \ + %reldir%/@FIRfilter/subsasgn.m \ + %reldir%/@FIRfilter/subsref.m \ + %reldir%/@polynomial/disp.m \ + %reldir%/@polynomial/double.m \ + %reldir%/@polynomial/end.m \ + %reldir%/@polynomial/get.m \ + %reldir%/@polynomial/mtimes.m \ + %reldir%/@polynomial/numel.m \ + %reldir%/@polynomial/plot.m \ + %reldir%/@polynomial/polynomial.m \ + %reldir%/@polynomial/polynomial_superiorto.m \ + %reldir%/@polynomial/polyval.m \ + %reldir%/@polynomial/roots.m \ + %reldir%/@polynomial/set.m \ + %reldir%/@polynomial/subsasgn.m \ + %reldir%/@polynomial/subsref.m \ + %reldir%/addtwomatrices.cc \ + %reldir%/celldemo.cc \ + %reldir%/embedded.cc \ + %reldir%/fortrandemo.cc \ + %reldir%/fortransub.f \ + %reldir%/funcdemo.cc \ + %reldir%/globaldemo.cc \ + %reldir%/helloworld.cc \ + %reldir%/make_int.cc \ + %reldir%/mex_demo.c \ + %reldir%/mycell.c \ + %reldir%/myfeval.c \ + %reldir%/myfevalf.f \ + %reldir%/myfunc.c \ + %reldir%/myhello.c \ + %reldir%/mypow2.c \ + %reldir%/myprop.c \ + %reldir%/myset.c \ + %reldir%/mysparse.c \ + %reldir%/mystring.c \ + %reldir%/mystruct.c \ + %reldir%/oct_demo.cc \ + %reldir%/oregonator.cc \ + %reldir%/oregonator.m \ + %reldir%/paramdemo.cc \ + %reldir%/polynomial2.m \ + %reldir%/standalone.cc \ + %reldir%/standalonebuiltin.cc \ + %reldir%/stringdemo.cc \ + %reldir%/structdemo.cc \ + %reldir%/unwinddemo.cc + +%canon_reldir%_EXTRA_DIST += \ + $(%canon_reldir%_SRC) + +EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST) + +CLEANFILES += $(%canon_reldir%_CLEANFILES) +DISTCLEANFILES += $(%canon_reldir%_DISTCLEANFILES) +MAINTAINERCLEANFILES += $(%canon_reldir%_MAINTAINERCLEANFILES) + +examples-clean: + rm -f $(%canon_reldir%_CLEANFILES) + +examples-distclean: examples-clean + rm -f $(%canon_reldir%_DISTCLEANFILES) + +examples-maintainer-clean: examples-distclean + rm -f $(%canon_reldir%_MAINTAINERCLEANFILES) diff -r 09a3c0e91e6e -r 2aa43d1c8c0d examples/data/module.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/data/module.mk Thu Jun 04 17:10:14 2020 -0400 @@ -0,0 +1,12 @@ +%canon_reldir%_EXTRA_DIST = + +%canon_reldir%_SRC = \ + %reldir%/penny.mat + +octdata_DATA += \ + $(%canon_reldir%_SRC) + +%canon_reldir%_EXTRA_DIST += \ + $(%canon_reldir%_SRC) + +EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST) diff -r 09a3c0e91e6e -r 2aa43d1c8c0d examples/module.mk --- a/examples/module.mk Mon Jun 01 14:07:20 2020 -0400 +++ b/examples/module.mk Thu Jun 04 17:10:14 2020 -0400 @@ -1,84 +1,11 @@ +%canon_reldir%_EXTRA_DIST = + %canon_reldir%_EXTRA_DIST = -%canon_reldir%_CLEANFILES = -%canon_reldir%_DISTCLEANFILES = -%canon_reldir%_MAINTAINERCLEANFILES = - -%canon_reldir%_data_SRC = \ - %reldir%/data/penny.mat - -octdata_DATA += \ - $(%canon_reldir%_data_SRC) - -%canon_reldir%_code_SRC = \ - %reldir%/code/@FIRfilter/FIRfilter.m \ - %reldir%/code/@FIRfilter/FIRfilter_aggregation.m \ - %reldir%/code/@FIRfilter/display.m \ - %reldir%/code/@FIRfilter/subsasgn.m \ - %reldir%/code/@FIRfilter/subsref.m \ - %reldir%/code/@polynomial/disp.m \ - %reldir%/code/@polynomial/double.m \ - %reldir%/code/@polynomial/end.m \ - %reldir%/code/@polynomial/get.m \ - %reldir%/code/@polynomial/mtimes.m \ - %reldir%/code/@polynomial/numel.m \ - %reldir%/code/@polynomial/plot.m \ - %reldir%/code/@polynomial/polynomial.m \ - %reldir%/code/@polynomial/polynomial_superiorto.m \ - %reldir%/code/@polynomial/polyval.m \ - %reldir%/code/@polynomial/roots.m \ - %reldir%/code/@polynomial/set.m \ - %reldir%/code/@polynomial/subsasgn.m \ - %reldir%/code/@polynomial/subsref.m \ - %reldir%/code/addtwomatrices.cc \ - %reldir%/code/celldemo.cc \ - %reldir%/code/embedded.cc \ - %reldir%/code/fortrandemo.cc \ - %reldir%/code/fortransub.f \ - %reldir%/code/funcdemo.cc \ - %reldir%/code/globaldemo.cc \ - %reldir%/code/helloworld.cc \ - %reldir%/code/make_int.cc \ - %reldir%/code/mex_demo.c \ - %reldir%/code/mycell.c \ - %reldir%/code/myfeval.c \ - %reldir%/code/myfevalf.f \ - %reldir%/code/myfunc.c \ - %reldir%/code/myhello.c \ - %reldir%/code/mypow2.c \ - %reldir%/code/myprop.c \ - %reldir%/code/myset.c \ - %reldir%/code/mysparse.c \ - %reldir%/code/mystring.c \ - %reldir%/code/mystruct.c \ - %reldir%/code/oct_demo.cc \ - %reldir%/code/oregonator.cc \ - %reldir%/code/oregonator.m \ - %reldir%/code/paramdemo.cc \ - %reldir%/code/polynomial2.m \ - %reldir%/code/standalone.cc \ - %reldir%/code/standalonebuiltin.cc \ - %reldir%/code/stringdemo.cc \ - %reldir%/code/structdemo.cc \ - %reldir%/code/unwinddemo.cc +include %reldir%/code/module.mk +include %reldir%/data/module.mk %canon_reldir%_EXTRA_DIST += \ - $(%canon_reldir%_data_SRC) \ - $(%canon_reldir%_code_SRC) \ - %reldir%/code/COPYING \ - %reldir%/module.mk + %reldir%/code/COPYING EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST) - -CLEANFILES += $(%canon_reldir%_CLEANFILES) -DISTCLEANFILES += $(%canon_reldir%_DISTCLEANFILES) -MAINTAINERCLEANFILES += $(%canon_reldir%_MAINTAINERCLEANFILES) - -examples-clean: - rm -f $(%canon_reldir%_CLEANFILES) - -examples-distclean: examples-clean - rm -f $(%canon_reldir%_DISTCLEANFILES) - -examples-maintainer-clean: examples-distclean - rm -f $(%canon_reldir%_MAINTAINERCLEANFILES)