texinfo/tp/tests Makefile.am htmlxref/Makefile....

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/05 10:34:03

Modified files:
        tp/tests       : Makefile.am 
        tp/tests/htmlxref: Makefile.am 
        tp/tests/htmlxref-only_mono: Makefile.am 
        tp/tests/htmlxref-only_split: Makefile.am 
Added files:
        tp/tests/htmlxref-only_split: htmlxref.cnf-texinfo 

Log message:
        Add the test of unused htmlxref.cnf in htmlxref-only_split.
        
        Simplify the creation of htmlxref.cnf files and put this in Makefile
        rules.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/htmlxref/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/htmlxref-only_mono/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/htmlxref-only_split/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/htmlxref-only_split/htmlxref.cnf-texinfo?cvsroot=texinfo&rev=1.1

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Makefile.am 29 Jan 2012 12:39:14 -0000      1.3
+++ Makefile.am 5 Feb 2012 10:34:02 -0000       1.4
@@ -1,13 +1,9 @@
-
-htmlxref_cnf_tests = htmlxref htmlxref-only_mono htmlxref-only_split
 base_tests = \
- formatting \
- $(htmlxref_cnf_tests)
+ formatting htmlxref htmlxref-only_mono htmlxref-only_split
 long_tests = \
  sectioning coverage indices nested_formats contents layout
 
-DIST_SUBDIRS = $(base_tests) $(long_tests) many_input_files
-SUBDIRS = . many_input_files
+SUBDIRS = . many_input_files $(base_tests) $(long_tests)
 
 copy-tests: copy-base copy-long
        cd many_input_files && $(MAKE) copy-tests
@@ -15,9 +11,6 @@
 copy-base:
        $(srcdir)/parser_tests.sh -copy $(base_tests)
 
-# this is not used directly when recursively doing long-check from the 
-# parent directory as TESTS is set to long_tests.sh, but long_tests.sh
-# calls 
 copy-long:
        $(srcdir)/parser_tests.sh -copy $(long_tests)
 
@@ -32,24 +25,27 @@
 all-checks: all
        $(MAKE) $(AM_MAKEFLAGS) check ALL_TESTS=yes
 
-# this is in order to have the files in .texinfo in the build dir
-all-local:
-       for dir in $(htmlxref_cnf_tests); do \
-               if [ -f "$(srcdir)/$$dir/htmlxref.cnf-texinfo" ]; then \
-                       $(mkdir_p) $$dir/.texinfo/ ; \
-                       ${INSTALL_DATA} "$(srcdir)/$$dir/htmlxref.cnf-texinfo" 
$$dir/.texinfo/ ; \
-               fi; \
-               if [ -f $(srcdir)/$$dir/htmlxref.cnf-ref ]; then \
-                       ${INSTALL_DATA} "$(srcdir)/$$dir/htmlxref.cnf-ref" 
$$dir/htmlxref.cnf ; \
-               fi; \
-       done
-       ${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref 
sectioning/equivalent_nodes-noderename.cnf
-
-clean-local:
-       for dir in $(htmlxref_cnf_tests); do \
-               rm -rf $$dir/.texinfo/ $$dir/htmlxref.cnf ; \
-       done
-       rm -f sectioning/equivalent_nodes-noderename.cnf
+# this is in order to have the htmlxref.cnf files in the build dir.
+# This is done in this directory to be sure that the files are there
+# when check is done in this directory.
+all-local: htmlxref/htmlxref.cnf htmlxref-only_mono/htmlxref.cnf \
+ htmlxref-only_split/htmlxref.cnf htmlxref-only_split/.texinfo/htmlxref.cnf
+
+htmlxref/htmlxref.cnf: htmlxref/htmlxref.cnf-ref
+       ${INSTALL_DATA} $< $@
+
+htmlxref-only_mono/htmlxref.cnf: htmlxref-only_mono/htmlxref.cnf-ref
+       ${INSTALL_DATA} $< $@
+
+htmlxref-only_split/htmlxref.cnf: htmlxref-only_split/htmlxref.cnf-ref
+       ${INSTALL_DATA} $< $@
+
+htmlxref-only_split/.texinfo/htmlxref.cnf: \
+ htmlxref-only_split/htmlxref.cnf-texinfo htmlxref-only_split/.texinfo
+       ${INSTALL_DATA} $< $@
+
+htmlxref-only_split/.texinfo:
+       $(mkdir_p) $@
 
 EXTRA_DIST = run_parser_all.sh parser_tests.sh \
  $(TESTS) $(long_TESTS) coverage_macro.texi

Index: htmlxref/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/htmlxref/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- htmlxref/Makefile.am        14 Jan 2012 19:01:37 -0000      1.1
+++ htmlxref/Makefile.am        5 Feb 2012 10:34:02 -0000       1.2
@@ -1,7 +1,7 @@
 EXTRA_DIST = htmlxref.cnf-ref \
  tests-parser.txt res_parser
 
-DISTCLEANFILES = tests.log tests.out
+DISTCLEANFILES = tests.log tests.out htmlxref.cnf
 
 distclean-local:
        rm -rf out_parser diffs

Index: htmlxref-only_mono/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/htmlxref-only_mono/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- htmlxref-only_mono/Makefile.am      14 Jan 2012 19:01:46 -0000      1.1
+++ htmlxref-only_mono/Makefile.am      5 Feb 2012 10:34:02 -0000       1.2
@@ -1,7 +1,7 @@
 EXTRA_DIST = htmlxref.cnf-ref \
  tests-parser.txt res_parser
 
-DISTCLEANFILES = tests.log tests.out
+DISTCLEANFILES = tests.log tests.out htmlxref.cnf
 
 distclean-local:
        rm -rf out_parser diffs

Index: htmlxref-only_split/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/htmlxref-only_split/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- htmlxref-only_split/Makefile.am     14 Jan 2012 19:01:53 -0000      1.1
+++ htmlxref-only_split/Makefile.am     5 Feb 2012 10:34:02 -0000       1.2
@@ -1,10 +1,10 @@
-EXTRA_DIST = htmlxref.cnf-ref \
+EXTRA_DIST = htmlxref.cnf-ref htmlxref.cnf-texinfo \
  tests-parser.txt res_parser
 
-DISTCLEANFILES = tests.log tests.out
+DISTCLEANFILES = tests.log tests.out htmlxref.cnf
 
 distclean-local:
-       rm -rf out_parser diffs
+       rm -rf out_parser diffs .texinfo
 
 dist-hook:
        rm -rf `find $(distdir)/res_parser -name CVS`

Index: htmlxref-only_split/htmlxref.cnf-texinfo
===================================================================
RCS file: htmlxref-only_split/htmlxref.cnf-texinfo
diff -N htmlxref-only_split/htmlxref.cnf-texinfo
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ htmlxref-only_split/htmlxref.cnf-texinfo    5 Feb 2012 10:34:03 -0000       
1.1
@@ -0,0 +1 @@
+manual section split-dir-manual-not_used/