grim/gplate

Some build system tweaks so that we pass make dist

2008-02-17, grim
b2ff0fcda944
Parents 843398396f00
Children 39799cdd59d9
Some build system tweaks so that we pass make dist
Moved tests/*.gplate to tests/templates/*.gplate
8 files changed, 14 insertions(+), 13 deletions(-)
  • +1 -0
    configure.ac
  • +4 -3
    tests/Makefile.am
  • +0 -5
    tests/html/Makefile.am
  • +0 -4
    tests/include1.gplate
  • +0 -1
    tests/include2.gplate
  • +4 -0
    tests/templates/Makefile.am
  • +4 -0
    tests/templates/include1.gplate
  • +1 -0
    tests/templates/include2.gplate
    • --- a/configure.ac Sun Feb 17 07:21:57 2008 -0600
    +++ b/configure.ac Sun Feb 17 17:33:53 2008 -0600
    @@ -177,6 +177,7 @@
    po/Makefile.in
    tests/Makefile
    tests/html/Makefile
    + tests/templates/Makefile
    ])
    dnl #######################################################################
    --- a/tests/Makefile.am Sun Feb 17 07:21:57 2008 -0600
    +++ b/tests/Makefile.am Sun Feb 17 17:33:53 2008 -0600
    @@ -1,10 +1,8 @@
    EXTRA_DIST=\
    check.xsl \
    - include1.gplate \
    - include2.gplate \
    test.h
    -SUBDIRS=html
    +SUBDIRS=html templates
    CLEANFILES=
    @@ -44,6 +42,9 @@
    check.xsl \
    gplate-tests.xml
    +dist-hook:
    + cp results.html html/results.html
    +
    endif
    endif
    --- a/tests/html/Makefile.am Sun Feb 17 07:21:57 2008 -0600
    +++ b/tests/html/Makefile.am Sun Feb 17 17:33:53 2008 -0600
    @@ -2,14 +2,9 @@
    failed.png \
    passed.png
    -CLEANFILES=results.html
    -
    if HAVE_XSLTPROC
    EXTRA_DIST+=results.html
    -results.html: ../results.html
    - cp ../results.html .
    -
    endif
    --- a/tests/include1.gplate Sun Feb 17 07:21:57 2008 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,4 +0,0 @@
    -before the include
    -{% include include2.gplate %}
    -after the include
    -
    --- a/tests/include2.gplate Sun Feb 17 07:21:57 2008 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +0,0 @@
    -inside the included file
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/templates/Makefile.am Sun Feb 17 17:33:53 2008 -0600
    @@ -0,0 +1,4 @@
    +EXTRA_DIST=\
    + include1.gplate \
    + include2.gplate
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/templates/include1.gplate Sun Feb 17 17:33:53 2008 -0600
    @@ -0,0 +1,4 @@
    +before the include
    +{% include include2.gplate %}
    +after the include
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/templates/include2.gplate Sun Feb 17 17:33:53 2008 -0600
    @@ -0,0 +1,1 @@
    +inside the included file