From 0678dacde93605f1b04e151473de32b21526f38f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 7 Jun 2013 17:12:07 -0500
Subject: Making sure the check is done in the source directory

---
 docs/reference/Makefile.am | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2c201bd..1788967 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -119,5 +119,15 @@ if ENABLE_GTK_DOC
  TESTS_ENVIRONMENT = cd $(srcdir) && \
    DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
    SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
+
+TESTS = gtkdoc-in-srcdir
+
+gtkdoc-in-srcdir: Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo "cd \"$(srcdir)\"" >> $@
+	@echo "$(GTKDOC_CHECK)" >> $@
+	@chmod +x $@
+
+DISTCLEANFILES = gtkdoc-in-srcdir
+
 endif
-- 
cgit v1.2.3


From 27a81fb59509b485fc37df4b56a48a6c1a944b0e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 7 Jun 2013 22:47:40 -0500
Subject: Going back to the environment style

---
 docs/reference/Makefile.am | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1788967..86483a6 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -116,18 +116,8 @@ EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
- TESTS_ENVIRONMENT = cd $(srcdir) && \
+TESTS_ENVIRONMENT = cd $(srcdir) && \
    DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
    SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-
-TESTS = gtkdoc-in-srcdir
-
-gtkdoc-in-srcdir: Makefile.am
-	@echo "#!/bin/sh" > $@
-	@echo "cd \"$(srcdir)\"" >> $@
-	@echo "$(GTKDOC_CHECK)" >> $@
-	@chmod +x $@
-
-DISTCLEANFILES = gtkdoc-in-srcdir
-
+TESTS = $(GTKDOC_CHECK)
 endif
-- 
cgit v1.2.3


From 5ab6b4964063e239068a53cc9ec73da07ec63fb2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 7 Jun 2013 23:26:18 -0500
Subject: Don't need the same directory twice

---
 docs/reference/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 86483a6..93c93ae 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -98,7 +98,7 @@ expand_content_files=
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
+GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
-- 
cgit v1.2.3


From 256ce018624f6e22e3f4eac272a2f812977fa6a4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 7 Jun 2013 23:26:37 -0500
Subject: Seems no one else has this on, no reason to be the odd ball.

---
 docs/reference/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 93c93ae..fd3479c 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -117,7 +117,7 @@ EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in
 # and run some sanity checks
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
-   DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-   SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
+  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+#TESTS = $(GTKDOC_CHECK)
 endif
-- 
cgit v1.2.3