--- milena/ChangeLog | 4 + milena/doc/examples/Makefile.am | 131 +++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2b64a70..761ce5c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-11 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/examples/Makefile.am: Clean up whitespace. + 2009-06-11 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor fixes. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index 8092243..497be61 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -72,7 +72,7 @@ tuto4_genericity_and_algorithms noinst_PROGRAMS += \ tuto3_colorize \ tuto3_println \ -tuto3_trace +tuto3_trace # Tuto4 noinst_PROGRAMS += \ @@ -142,7 +142,6 @@ all: mkdir -p $(OUTPUTS_BUILDDIR) mkdir -p $(FIGURES_BUILDDIR) - run-examples: all @failcom='exit 1'; \ list='$(noinst_PROGRAMS)'; for bin in $$list; do \ @@ -156,30 +155,30 @@ data-regen: run-examples split-examples split-outputs diff-data diff-data: run-examples split-examples @failcom='exit 1'; \ - has_txt_diff=""; \ - txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ - echo "Diff `basename $$txt`"; \ - diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ - || has_txt_diff+=" `basename $$txt`"; \ - done; \ - has_fig_diff=""; \ - figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ - echo "Diff `basename $$fig`"; \ - diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ - || has_fig_diff+=" `basename $$fig`"; \ - done; \ - has_split_out_diff=""; \ - split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist; do \ - echo "Diff `basename $$split_out`"; \ - diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ - || has_split_out_diff+=" `basename $$split_out`"; \ - done; \ - has_split_ex_diff=""; \ - split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist; do \ - echo "Diff `basename $$split_ex`"; \ - diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ - || has_split_ex_diff+=" `basename $$split_ex`"; \ - done; \ + has_txt_diff=""; \ + txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ + echo "Diff `basename $$txt`"; \ + diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ + || has_txt_diff+=" `basename $$txt`"; \ + done; \ + has_fig_diff=""; \ + figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ + echo "Diff `basename $$fig`"; \ + diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ + || has_fig_diff+=" `basename $$fig`"; \ + done; \ + has_split_out_diff=""; \ + split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist; do \ + echo "Diff `basename $$split_out`"; \ + diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ + || has_split_out_diff+=" `basename $$split_out`"; \ + done; \ + has_split_ex_diff=""; \ + split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist; do \ + echo "Diff `basename $$split_ex`"; \ + diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ + || has_split_ex_diff+=" `basename $$split_ex`"; \ + done; \ (test -z "$$has_txt_diff" && test -z "$$has_fig_diff" && \ test -z "$$has_split_out_diff" && test -z "$$has_split_ex_diff")\ || (echo "--------"; \ @@ -187,63 +186,61 @@ diff-data: run-examples split-examples echo " The following files differ from their \ reference or their reference file does not exist:"; \ echo "--------"; \ - echo "* Outputs:"; \ - echo ""; \ - echo "$$has_txt_diff"; \ - echo ""; \ + echo "* Outputs:"; \ + echo ""; \ + echo "$$has_txt_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Figures:"; \ - echo ""; \ - echo "$$has_fig_diff"; \ - echo ""; \ + echo "* Figures:"; \ + echo ""; \ + echo "$$has_fig_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Split outputs:"; \ - echo ""; \ - echo "$$has_split_out_diff"; \ - echo ""; \ + echo "* Split outputs:"; \ + echo ""; \ + echo "$$has_split_out_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Split examples:"; \ - echo ""; \ - echo "$$has_split_ex_diff"; \ - echo ""; \ + echo "* Split examples:"; \ + echo ""; \ + echo "$$has_split_ex_diff"; \ + echo ""; \ echo "--------"; \ - echo "* Please update manually the reference files located \ -in:"; \ - echo ""; \ + echo "* Please update manually the reference files located in:" \ + echo ""; \ echo " $(OUTPUTS_SRCDIR)"; \ echo " $(FIGURES_SRCDIR)"; \ echo " $(SPLIT_EXAMPLES_SRCDIR)"; \ echo " $(SPLIT_OUTPUTS_SRCDIR)"; \ - echo ""; \ - echo "* Reference files can updated automatically with \ -'make fix-refdata'"; \ - echo ""; \ - echo ""; \ - eval $$failcom); + echo ""; \ + echo "* Reference files can updated automatically with 'make fix-refdata'"; \ + echo ""; \ + echo ""; \ + eval $$failcom); fix-refdata: @failcom='exit 1'; \ - txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ - diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ - || echo "Updating reference file for $$txt"; \ + txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ + diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ + || echo "Updating reference file for $$txt"; \ cp $$txt $(OUTPUTS_SRCDIR); \ - done; \ - figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ - diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ - || echo "Updating reference file for $$fig"; \ + done; \ + figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ + diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ + || echo "Updating reference file for $$fig"; \ cp $$fig $(FIGURES_SRCDIR); \ - done; \ - split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*.txt"; for split_out in $$split_outlist; do \ - diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ - || echo "Updating reference file for $$split_out"; \ + done; \ + split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*.txt"; for split_out in $$split_outlist; do \ + diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ + || echo "Updating reference file for $$split_out"; \ cp $$split_out $(SPLIT_OUTPUTS_SRCDIR); \ - done; \ - split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*.cc"; for split_ex in $$split_exlist; do \ - diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ - || echo "Updating reference file for $$split_ex"; \ + done; \ + split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*.cc"; for split_ex in $$split_exlist; do \ + diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ + || echo "Updating reference file for $$split_ex"; \ cp $$split_ex $(SPLIT_EXAMPLES_SRCDIR); \ - done; + done; split-examples: -- 1.6.2.4