diff options
| author | Stef Walter <stefw@gnome.org> | 2014-03-04 08:20:53 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-03-04 12:57:19 +0100 |
| commit | b72048c920f50df85cb398f4309e68a575d8879e (patch) | |
| tree | 78e89081991e80e68a05d76583d8e5d96ddb53fd /docs | |
| parent | ec89646b1a1594193d56dc18ffd0da15b211ff82 (diff) | |
| download | libsecret-b72048c920f50df85cb398f4309e68a575d8879e.tar.gz | |
Makefile.am: Use a single Makefile.am and parallel tests
Allow parallel building and testing by using a single Makefile.am
Implement parallel testing using TAP, with various drivers and
compilers living in the build/ directory.
Fix all sorts of issues that this caused, including builddir != srcdir,
leaks in tests and so on.
It would have been nice to break out all the above into separate
commits ... blush.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 6 | ||||
| -rw-r--r-- | docs/man/Makefile.am | 10 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/libsecret/Makefile.am | 4 |
4 files changed, 5 insertions, 17 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 19f6265..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ - -SUBDIRS = reference - -if WITH_MANPAGES -SUBDIRS += man -endif diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 66bcfd5..07bfd55 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -6,14 +6,10 @@ XSLTPROC_FLAGS = \ --stringparam man.authors.section.enabled 0 \ --stringparam man.copyright.section.enabled 0 -.xml.1: +secret-tool.1: docs/man/secret-tool.xml $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -man_MANS = \ +man_MANS += \ secret-tool.1 -xml_files = $(man_MANS:.1=.xml) - -EXTRA_DIST = $(xml_files) - -DISTCLEANFILES = $(man_MANS) +EXTRA_DIST += docs/man/secret-tool.xml diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am deleted file mode 100644 index 3173a7f..0000000 --- a/docs/reference/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = libsecret diff --git a/docs/reference/libsecret/Makefile.am b/docs/reference/libsecret/Makefile.am index 137be73..410a23e 100644 --- a/docs/reference/libsecret/Makefile.am +++ b/docs/reference/libsecret/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)/libsecret +DOC_SOURCE_DIR=$(top_srcdir)/libsecret $(top_builddir)/libsecret # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -89,7 +89,7 @@ GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \ -Wno-deprecated-declarations GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS) \ - $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la + $(top_builddir)/libsecret-@SECRET_MAJOR@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make |