diff options
| author | Stef Walter <stefw@gnome.org> | 2014-03-02 16:43:19 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-03-03 08:17:56 +0100 |
| commit | 9019498dfef15efec4d12eee8becc55781062a30 (patch) | |
| tree | 9bc43449cb2bf4cf228fa0fd86922341ce07419a /docs | |
| parent | 4a141c9e21268a9d6a531aaf6c15032979c85aa9 (diff) | |
| download | gcr-9019498dfef15efec4d12eee8becc55781062a30.tar.gz | |
Makefile.am: Single Makefile mode and parallel-tests
gtk-doc doesn't work as an included Makefile so continue to
use SUBDIRS with docs/reference/*
Run the tests using TAP. Unfortunately the GTest --tap output
mode doesn't behave well in the face of failures, and doesn't
output a test plan. Use our own tap-driver and tap-compiler
for these reasons.
This also fixes several builddir != srcdir issues and testing hacks
that were sneaking around in the code base.
Move the tests into the same directories as the code that it
is testing.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/gck/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/reference/gcr/Makefile.am | 8 |
4 files changed, 6 insertions, 10 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index cac25f2..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = reference diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am deleted file mode 100644 index 6a9b2af..0000000 --- a/docs/reference/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = gcr gck diff --git a/docs/reference/gck/Makefile.am b/docs/reference/gck/Makefile.am index d7351d4..5733c3d 100644 --- a/docs/reference/gck/Makefile.am +++ b/docs/reference/gck/Makefile.am @@ -17,7 +17,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=$(top_srcdir)/gck +DOC_SOURCE_DIR=$(top_srcdir)/gck $(top_builddir)/gck # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -88,7 +88,7 @@ expand_content_files= GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \ -Wno-deprecated-declarations GTKDOC_LIBS= $(GLIB_LIBS) \ - $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE)-@GCK_MAJOR@.la + $(top_builddir)/lib$(DOC_MODULE)-@GCK_MAJOR@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am index 37c1fc9..1c6a9ee 100644 --- a/docs/reference/gcr/Makefile.am +++ b/docs/reference/gcr/Makefile.am @@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=$(top_srcdir)/$(DOC_MODULE) $(top_srcdir)/ui +DOC_SOURCE_DIR=$(top_srcdir)/$(DOC_MODULE) $(top_srcdir)/ui $(top_builddir)/$(DOC_MODULE) $(top_builddir)/ui # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -121,9 +121,9 @@ expand_content_files= GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \ -Wno-deprecated-declarations GTKDOC_LIBS= $(GLIB_LIBS) \ - $(top_builddir)/ui/libgcr-ui-@GCR_MAJOR@.la \ - $(top_builddir)/gcr/libgcr-base-@GCR_MAJOR@.la \ - $(top_builddir)/gck/libgck-@GCK_MAJOR@.la + $(top_builddir)/libgcr-ui-@GCR_MAJOR@.la \ + $(top_builddir)/libgcr-base-@GCR_MAJOR@.la \ + $(top_builddir)/libgck-@GCK_MAJOR@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make |