[folks] docs: don't include the img/* content to avoid a build break
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] docs: don't include the img/* content to avoid a build break
- Date: Mon, 8 Jul 2013 17:30:10 +0000 (UTC)
commit 61600fec79c2a437fb763257456a3e3b4c386388
Author: Travis Reitter <travis reitter collabora co uk>
Date: Mon Jul 8 10:15:35 2013 -0700
docs: don't include the img/* content to avoid a build break
This ignores content in the img/ subdir to avoid build errors if it's empty
(as it currently is). This directory will store custom images, so if we add
any, we will need to re-add those files to the appropriate *_DATA
definitions.
docs/Makefile.am | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f3511a2..d94b21a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,7 +22,6 @@ folks_wiki_pages = \
EXTRA_DIST = $(folks_wiki_files)
folksdocdir=$(datadir)/devhelp/references/folks
-folksimgdir=$(datadir)/devhelp/references/folks/img
folksgtkdocdir=$(datadir)/gtk-doc/html/folks
@@ -41,11 +40,7 @@ folksdoc_DATA = \
folksgtkdoc_DATA = gtk-doc/folks/html/*
-folksimg_DATA = \
- folks/folks/img/*.png \
- $(NULL)
-
-$(folksdoc_DATA) $(folksimg_DATA): folks-doc.stamp
+$(folksdoc_DATA): folks-doc.stamp
$(folksgtkdoc_DATA): folks-gtk-doc.stamp
valadoc_flags = \
@@ -109,7 +104,6 @@ folks-gtk-doc.stamp: $(folks_doc_files) $(folks_wiki_files)
# Telepathy docs #
#####################
folkstelepathydocdir=$(datadir)/devhelp/references/folks-telepathy
-folkstelepathyimgdir=$(datadir)/devhelp/references/folks-telepathy/img
folkstelepathygtkdocdir=$(datadir)/gtk-doc/html/folks-telepathy
folkstelepathydoc_DATA = \
@@ -119,11 +113,7 @@ folkstelepathydoc_DATA = \
folkstelepathygtkdoc_DATA = gtk-doc/folks-telepathy/html/*
-folkstelepathyimg_DATA = \
- folks-telepathy/folks-telepathy/img/*.png \
- $(NULL)
-
-$(folkstelepathydoc_DATA) $(folkstelepathyimg_DATA): \
+$(folkstelepathydoc_DATA): \
folks-telepathy-doc.stamp \
$(NULL)
$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc.stamp
@@ -193,7 +183,6 @@ upload_docs += upload-docs-c-folks-telepathy upload-docs-vala-folks-telepathy
#####################
if ENABLE_EDS
folksedsdocdir=$(datadir)/devhelp/references/folks-eds
-folksedsimgdir=$(datadir)/devhelp/references/folks-eds/img
folksedsgtkdocdir=$(datadir)/gtk-doc/html/folks-eds
folksedsdoc_DATA = \
@@ -203,11 +192,7 @@ folksedsdoc_DATA = \
folksedsgtkdoc_DATA = gtk-doc/folks-eds/html/*
-folksedsimg_DATA = \
- folks-eds/folks-eds/img/*.png \
- $(NULL)
-
-$(folksedsdoc_DATA) $(folksedsimg_DATA): \
+$(folksedsdoc_DATA): \
folks-eds-doc.stamp \
$(NULL)
$(folksedsgtkdoc_DATA): folks-eds-gtk-doc.stamp
@@ -265,7 +250,6 @@ endif # ENABLE_EDS
#####################
if ENABLE_LIBSOCIALWEB
folkslibsocialwebdocdir=$(datadir)/devhelp/references/folks-libsocialweb
-folkslibsocialwebimgdir=$(datadir)/devhelp/references/folks-libsocialweb/img
folkslibsocialwebgtkdocdir=$(datadir)/gtk-doc/html/folks-libsocialweb
folkslibsocialwebdoc_DATA = \
@@ -275,11 +259,7 @@ folkslibsocialwebdoc_DATA = \
folkslibsocialwebgtkdoc_DATA = gtk-doc/folks-libsocialweb/html/*
-folkslibsocialwebimg_DATA = \
- folks-libsocialweb/folks-libsocialweb/img/*.png \
- $(NULL)
-
-$(folkslibsocialwebdoc_DATA) $(folkslibsocialwebimg_DATA): \
+$(folkslibsocialwebdoc_DATA): \
folks-libsocialweb-doc.stamp \
$(NULL)
$(folkslibsocialwebgtkdoc_DATA): folks-libsocialweb-gtk-doc.stamp
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]