From c7e965f4ee26b95b10b80756f24589019f9d3857 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Wed, 29 May 2013 21:33:04 -0400 Subject: [PATCH] docs/: ignore gtester Makefile targets Mark 'test', 'test-report', 'perf-report' and 'full-report' as PHONY in docs/Makefile.am to prevent recursion of gtester into the documentation subdirectories. Stop including Makefile.decl from these directories since it is no longer necessary. This will clear up the warnings about EXTRA_DIST being defined once in gtk-doc.make and again in Makefile.decl. --- docs/Makefile.am | 5 +++-- docs/reference/Makefile.am | 2 -- docs/reference/gio/Makefile.am | 1 - docs/reference/gio/gdbus-object-manager-example/Makefile.am | 1 - docs/reference/glib/Makefile.am | 1 - docs/reference/gobject/Makefile.am | 1 - 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 2349f44..76157af 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,11 +1,12 @@ ## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl SUBDIRS = reference -EXTRA_DIST += debugging.txt macros.txt +EXTRA_DIST = debugging.txt macros.txt files: @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ echo $$p; \ done + +.PHONY: test test-report perf-report full-report diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 63cf90d..178aad1 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,3 +1 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = glib gobject gio diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 99606d3..112626b 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -1,4 +1,3 @@ -include $(top_srcdir)/Makefile.decl NULL = SUBDIRS = gdbus-object-manager-example diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am index 53acd51..50b0f19 100644 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am +++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am @@ -1,4 +1,3 @@ -include $(top_srcdir)/Makefile.decl NULL = # The name of the module. diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index 54918c8..2879607 100644 --- a/docs/reference/glib/Makefile.am +++ b/docs/reference/glib/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl AUTOMAKE_OPTIONS = 1.6 diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am index dd89464..b3423f3 100644 --- a/docs/reference/gobject/Makefile.am +++ b/docs/reference/gobject/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl AUTOMAKE_OPTIONS = 1.6 -- 2.7.4