GNOME.org
 

[f-spot] Move help into help folder, add to build.

commit 951c6ea66496a70705f3d1ca0edbd74ca2a2095d
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun Jun 6 18:27:34 2010 +0200

    Move help into help folder, add to build.

 Makefile.am                                       |    1 +
 autogen.sh                                        |    4 +-
 build/m4/shamrock/gnome-doc.m4                    |   11 ++++
 configure.ac                                      |   12 +++--
 docs/Makefile.am                                  |   19 --------
 {docs => help}/C/23hq.page                        |    0
 {docs => help}/C/Makefile.am                      |    0
 {docs => help}/C/adjust-color.page                |    0
 {docs => help}/C/cd.page                          |    0
 {docs => help}/C/colors.page                      |    0
 {docs => help}/C/date-search.page                 |    0
 {docs => help}/C/enhancements.page                |    0
 {docs => help}/C/extensions.page                  |    0
 {docs => help}/C/facebook.page                    |    0
 {docs => help}/C/figures/f-spot-adjust-colors.png |  Bin 1252 -> 1252 bytes
 {docs => help}/C/figures/f-spot-autocolor.png     |  Bin 1175 -> 1175 bytes
 {docs => help}/C/figures/f-spot-crop.png          |  Bin 2822 -> 2822 bytes
 {docs => help}/C/figures/f-spot-desaturate.png    |  Bin 778 -> 778 bytes
 {docs => help}/C/figures/f-spot-fullscreen.png    |  Bin 687 -> 687 bytes
 {docs => help}/C/figures/f-spot-red-eye.png       |  Bin 1149 -> 1149 bytes
 {docs => help}/C/figures/f-spot-sepia.png         |  Bin 984 -> 984 bytes
 {docs => help}/C/figures/f-spot-slideshow.png     |  Bin 329 -> 329 bytes
 {docs => help}/C/figures/f-spot-soft-focus.png    |  Bin 1356 -> 1356 bytes
 {docs => help}/C/figures/f-spot-straighten.png    |  Bin 1087 -> 1087 bytes
 {docs => help}/C/file-management.page             |    0
 {docs => help}/C/flickr.page                      |    0
 {docs => help}/C/folder.page                      |    0
 {docs => help}/C/general-editing.page             |    0
 {docs => help}/C/import-photos.page               |    0
 {docs => help}/C/import-roll-search.page          |    0
 {docs => help}/C/index.page                       |    0
 {docs => help}/C/introduction.page                |    0
 {docs => help}/C/picasa.page                      |    0
 {docs => help}/C/rate-search.page                 |    0
 {docs => help}/C/ratings.page                     |    0
 {docs => help}/C/smugmug.page                     |    0
 {docs => help}/C/tag-attach.page                  |    0
 {docs => help}/C/tag-creation.page                |    0
 {docs => help}/C/tag-delete.page                  |    0
 {docs => help}/C/tag-remove.page                  |    0
 {docs => help}/C/tag-search.page                  |    0
 {docs => help}/C/tags.page                        |    0
 {docs => help}/C/upload-to-web.page               |    0
 {docs => help}/C/versioning.page                  |    0
 {docs => help}/C/zooomr.page                      |    0
 help/Makefile.am                                  |   52 +++++++++++++++++++++
 46 files changed, 73 insertions(+), 26 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f09bac..7a5c94e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = 		\
 	data 		\
 	lib 		\
 	docs		\
+    help        \
 	icons		\
 	tools		\
 	po			\
diff --git a/autogen.sh b/autogen.sh
index fc92c57..a658689 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -63,15 +63,15 @@ check_autotool_version autoconf 2.53
 check_autotool_version $LIBTOOLIZE 1.4.3
 check_autotool_version intltoolize 0.35.0
 check_autotool_version pkg-config 0.14.0
-check_autotool_version gnome-doc-prepare 0.0.0
+check_autotool_version gnome-doc-prepare 0.17.3
 
 run git submodule update --init
+run gnome-doc-prepare
 run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
 run aclocal -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
 run autoconf
 run autoheader
-run gnome-doc-prepare
 test -f config.h.in && touch config.h.in
 run automake --gnu --add-missing --force --copy \
 	-Wno-portability -Wno-portability
diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4
new file mode 100644
index 0000000..43785c7
--- /dev/null
+++ b/build/m4/shamrock/gnome-doc.m4
@@ -0,0 +1,11 @@
+AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
+[
+	PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils >= $1, 
+		HAVE_GNOME_DOC_UTILS=yes, HAVE_GNOME_DOC_UTILS=no)
+
+    AM_CONDITIONAL(ENABLE_GNOME_DOCS, test "x$HAVE_GNOME_DOC_UTILS" = "xyes")
+
+    if test "x$HAVE_GNOME_DOC_UTILS" = "xyes"; then
+        GNOME_DOC_INIT([$1])
+    fi
+])
diff --git a/configure.ac b/configure.ac
index 7b4f3fa..080ac05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,9 @@ IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+dnl User help
+GNOME_DOC_INIT
+
 dnl How to configure for distcheck
 DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-release"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
@@ -58,6 +61,7 @@ SHAMROCK_EXPAND_LIBDIR
 SHAMROCK_EXPAND_BINDIR
 SHAMROCK_EXPAND_DATADIR
 
+SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
 
 dnl Mono and gmcs
 SHAMROCK_CHECK_MONO_MODULE(2.2)
@@ -125,11 +129,6 @@ if test ! -x "$GAPI2CODEGEN"; then
 	AC_MSG_ERROR([No gapi code generator found])
 fi
 
-
-dnl -- Initialize docs
-
-GNOME_DOC_INIT
-
 dnl -- Check for mono pc file
 
 AC_MSG_CHECKING([for mono.pc])
@@ -317,6 +316,8 @@ data/desktop-files/f-spot.desktop.in
 data/desktop-files/f-spot-view.desktop.in
 data/desktop-files/f-spot-import.desktop.in
 
+help/Makefile
+
 lib/GKeyFile/Makefile
 lib/gio-sharp/Makefile
 lib/gio-sharp/gio/Makefile
@@ -403,6 +404,7 @@ ${PACKAGE}-${VERSION}
 
   Build/Development:
     Unit Tests:        ${do_tests}
+    User Help:         ${HAVE_GNOME_DOC_UTILS} (requires gnome-doc-utils >= 0.17.3)
 
 Run 'make' to build F-Spot.
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 496b41a..e69de29 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,19 +0,0 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = f-spot
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-DOC_FIGURES =					\
-	figures/f-spot-adjust-colors.png	\
-	figures/f-spot-autocolor.png		\
-	figures/f-spot-crop.png			\
-	figures/f-spot-desaturate.png		\
-	figures/f-spot-fullscreen.png		\
-	figures/f-spot-red-eye.png		\
-	figures/f-spot-sepia.png		\
-	figures/f-spot-slideshow.png		\
-	figures/f-spot-soft-focus.png		\
-	figures/f-spot-straighten.png
-
-DOC_LINGUAS = cs da de es fr it oc pt_BR ru sl sv uk
diff --git a/docs/C/23hq.page b/help/C/23hq.page
similarity index 100%
rename from docs/C/23hq.page
rename to help/C/23hq.page
diff --git a/docs/C/Makefile.am b/help/C/Makefile.am
similarity index 100%
rename from docs/C/Makefile.am
rename to help/C/Makefile.am
diff --git a/docs/C/adjust-color.page b/help/C/adjust-color.page
similarity index 100%
rename from docs/C/adjust-color.page
rename to help/C/adjust-color.page
diff --git a/docs/C/cd.page b/help/C/cd.page
similarity index 100%
rename from docs/C/cd.page
rename to help/C/cd.page
diff --git a/docs/C/colors.page b/help/C/colors.page
similarity index 100%
rename from docs/C/colors.page
rename to help/C/colors.page
diff --git a/docs/C/date-search.page b/help/C/date-search.page
similarity index 100%
rename from docs/C/date-search.page
rename to help/C/date-search.page
diff --git a/docs/C/enhancements.page b/help/C/enhancements.page
similarity index 100%
rename from docs/C/enhancements.page
rename to help/C/enhancements.page
diff --git a/docs/C/extensions.page b/help/C/extensions.page
similarity index 100%
rename from docs/C/extensions.page
rename to help/C/extensions.page
diff --git a/docs/C/facebook.page b/help/C/facebook.page
similarity index 100%
rename from docs/C/facebook.page
rename to help/C/facebook.page
diff --git a/docs/C/figures/f-spot-adjust-colors.png b/help/C/figures/f-spot-adjust-colors.png
similarity index 100%
rename from docs/C/figures/f-spot-adjust-colors.png
rename to help/C/figures/f-spot-adjust-colors.png
diff --git a/docs/C/figures/f-spot-autocolor.png b/help/C/figures/f-spot-autocolor.png
similarity index 100%
rename from docs/C/figures/f-spot-autocolor.png
rename to help/C/figures/f-spot-autocolor.png
diff --git a/docs/C/figures/f-spot-crop.png b/help/C/figures/f-spot-crop.png
similarity index 100%
rename from docs/C/figures/f-spot-crop.png
rename to help/C/figures/f-spot-crop.png
diff --git a/docs/C/figures/f-spot-desaturate.png b/help/C/figures/f-spot-desaturate.png
similarity index 100%
rename from docs/C/figures/f-spot-desaturate.png
rename to help/C/figures/f-spot-desaturate.png
diff --git a/docs/C/figures/f-spot-fullscreen.png b/help/C/figures/f-spot-fullscreen.png
similarity index 100%
rename from docs/C/figures/f-spot-fullscreen.png
rename to help/C/figures/f-spot-fullscreen.png
diff --git a/docs/C/figures/f-spot-red-eye.png b/help/C/figures/f-spot-red-eye.png
similarity index 100%
rename from docs/C/figures/f-spot-red-eye.png
rename to help/C/figures/f-spot-red-eye.png
diff --git a/docs/C/figures/f-spot-sepia.png b/help/C/figures/f-spot-sepia.png
similarity index 100%
rename from docs/C/figures/f-spot-sepia.png
rename to help/C/figures/f-spot-sepia.png
diff --git a/docs/C/figures/f-spot-slideshow.png b/help/C/figures/f-spot-slideshow.png
similarity index 100%
rename from docs/C/figures/f-spot-slideshow.png
rename to help/C/figures/f-spot-slideshow.png
diff --git a/docs/C/figures/f-spot-soft-focus.png b/help/C/figures/f-spot-soft-focus.png
similarity index 100%
rename from docs/C/figures/f-spot-soft-focus.png
rename to help/C/figures/f-spot-soft-focus.png
diff --git a/docs/C/figures/f-spot-straighten.png b/help/C/figures/f-spot-straighten.png
similarity index 100%
rename from docs/C/figures/f-spot-straighten.png
rename to help/C/figures/f-spot-straighten.png
diff --git a/docs/C/file-management.page b/help/C/file-management.page
similarity index 100%
rename from docs/C/file-management.page
rename to help/C/file-management.page
diff --git a/docs/C/flickr.page b/help/C/flickr.page
similarity index 100%
rename from docs/C/flickr.page
rename to help/C/flickr.page
diff --git a/docs/C/folder.page b/help/C/folder.page
similarity index 100%
rename from docs/C/folder.page
rename to help/C/folder.page
diff --git a/docs/C/general-editing.page b/help/C/general-editing.page
similarity index 100%
rename from docs/C/general-editing.page
rename to help/C/general-editing.page
diff --git a/docs/C/import-photos.page b/help/C/import-photos.page
similarity index 100%
rename from docs/C/import-photos.page
rename to help/C/import-photos.page
diff --git a/docs/C/import-roll-search.page b/help/C/import-roll-search.page
similarity index 100%
rename from docs/C/import-roll-search.page
rename to help/C/import-roll-search.page
diff --git a/docs/C/index.page b/help/C/index.page
similarity index 100%
rename from docs/C/index.page
rename to help/C/index.page
diff --git a/docs/C/introduction.page b/help/C/introduction.page
similarity index 100%
rename from docs/C/introduction.page
rename to help/C/introduction.page
diff --git a/docs/C/picasa.page b/help/C/picasa.page
similarity index 100%
rename from docs/C/picasa.page
rename to help/C/picasa.page
diff --git a/docs/C/rate-search.page b/help/C/rate-search.page
similarity index 100%
rename from docs/C/rate-search.page
rename to help/C/rate-search.page
diff --git a/docs/C/ratings.page b/help/C/ratings.page
similarity index 100%
rename from docs/C/ratings.page
rename to help/C/ratings.page
diff --git a/docs/C/smugmug.page b/help/C/smugmug.page
similarity index 100%
rename from docs/C/smugmug.page
rename to help/C/smugmug.page
diff --git a/docs/C/tag-attach.page b/help/C/tag-attach.page
similarity index 100%
rename from docs/C/tag-attach.page
rename to help/C/tag-attach.page
diff --git a/docs/C/tag-creation.page b/help/C/tag-creation.page
similarity index 100%
rename from docs/C/tag-creation.page
rename to help/C/tag-creation.page
diff --git a/docs/C/tag-delete.page b/help/C/tag-delete.page
similarity index 100%
rename from docs/C/tag-delete.page
rename to help/C/tag-delete.page
diff --git a/docs/C/tag-remove.page b/help/C/tag-remove.page
similarity index 100%
rename from docs/C/tag-remove.page
rename to help/C/tag-remove.page
diff --git a/docs/C/tag-search.page b/help/C/tag-search.page
similarity index 100%
rename from docs/C/tag-search.page
rename to help/C/tag-search.page
diff --git a/docs/C/tags.page b/help/C/tags.page
similarity index 100%
rename from docs/C/tags.page
rename to help/C/tags.page
diff --git a/docs/C/upload-to-web.page b/help/C/upload-to-web.page
similarity index 100%
rename from docs/C/upload-to-web.page
rename to help/C/upload-to-web.page
diff --git a/docs/C/versioning.page b/help/C/versioning.page
similarity index 100%
rename from docs/C/versioning.page
rename to help/C/versioning.page
diff --git a/docs/C/zooomr.page b/help/C/zooomr.page
similarity index 100%
rename from docs/C/zooomr.page
rename to help/C/zooomr.page
diff --git a/help/Makefile.am b/help/Makefile.am
new file mode 100644
index 0000000..22c6e8d
--- /dev/null
+++ b/help/Makefile.am
@@ -0,0 +1,52 @@
+if ENABLE_GNOME_DOCS
+include $(top_srcdir)/gnome-doc-utils.make
+
+DOC_ID = giggle
+DOC_INCLUDES =
+
+DOC_PAGES = \
+    23hq.page \
+    adjust-color.page \
+    cd.page \
+    colors.page \
+    date-search.page \
+    enhancements.page \
+    extensions.page \
+    facebook.page \
+    file-management.page \
+    flickr.page \
+    folder.page \
+    general-editing.page \
+    import-photos.page \
+    import-roll-search.page \
+    index.page \
+    introduction.page \
+    picasa.page \
+    rate-search.page \
+    ratings.page \
+    smugmug.page \
+    tag-attach.page \
+    tag-creation.page \
+    tag-delete.page \
+    tag-remove.page \
+    tag-search.page \
+    tags.page \
+    upload-to-web.page \
+    versioning.page \
+    zooomr.page
+
+DOC_FIGURES = \
+    figures/f-spot-adjust-colors.png \
+    figures/f-spot-autocolor.png \
+    figures/f-spot-crop.png \
+    figures/f-spot-desaturate.png \
+    figures/f-spot-fullscreen.png \
+    figures/f-spot-red-eye.png \
+    figures/f-spot-sepia.png \
+    figures/f-spot-slideshow.png \
+    figures/f-spot-soft-focus.png \
+    figures/f-spot-straighten.png
+
+DOC_LINGUAS = 
+dist-hook: doc-dist-hook
+endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]