[cairo-commit] 2 commits - gtk-doc.make test/Makefile.am

[Behdad Esfahbod]

 gtk-doc.make     |    2 +-
 test/Makefile.am |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree e92d693e073dc5fba871b615909206f0049ead41 (from 6ced3edb69f5f5a25a5c40c0bad7dc638cc216cb)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jul 27 14:58:46 2006 -0400

    Make "CAIRO_TEST_TARGET=... make check" work again
    
    Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
    one can limit tested targets both through CAIRO_TEST_TARGET env var
    and TARGETS make var on the command line.

diff --git a/test/Makefile.am b/test/Makefile.am
index 5086ffe..99c6d55 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -454,10 +454,10 @@ endif
 
 EXTRA_PROGRAMS = $(TESTS) $(SUPPORT_PROGS)
 
-# Emptying TARGET makes sure that user's environment variable doesn't
-# affect tested targets in test suite.  To limit tested targets, one
-# has to set TARGETS=target,list on the make command line
-TARGETS =
+# Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
+# one can limit tested targets both through CAIRO_TEST_TARGET env var
+# and TARGETS make var on the command line.
+TARGETS = $(CAIRO_TEST_TARGET)
 
 TESTS_ENVIRONMENT = CAIRO_XFAIL_TESTS="$(XFAIL_TESTS)" CAIRO_TEST_TARGET="$(TARGETS)"
 
diff-tree 6ced3edb69f5f5a25a5c40c0bad7dc638cc216cb (from 280823173dce520a43eb54c0b18d2e2eae6a55a0)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 21 18:46:16 2006 -0400

    Don't make doc upon make install.

diff --git a/gtk-doc.make b/gtk-doc.make
index a1fbac6..18b15e0 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -88,7 +88,7 @@ sgml.stamp: sgml-build.stamp
 
 #### html ####
 
-dist-hook install-data-local: html-build.stamp
+dist-hook: html-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'