Skip to content
Browse files

Add help files to buildsystem

  • Loading branch information...
1 parent 3180749 commit 392c48c44676c36b3791fb9ef3b3d3c21496a981 @deejay1 deejay1 committed Aug 30, 2010
Showing with 56 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +5 −1 Makefile.am
  3. +9 −0 autogen.sh
  4. +18 −2 build/m4/shamrock/gnome-doc.m4
  5. +6 −0 configure.ac
  6. +17 −0 help/Makefile.am
View
1 .gitignore
@@ -35,3 +35,4 @@ Defines.cs
SparkleShare/sparkleshare
po/sparkleshare.pot
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
+gnome-doc-utils.make
View
6 Makefile.am
@@ -1,5 +1,6 @@
SUBDIRS = \
build \
+ help \
NotifySharp \
FriendFace \
SparkleLib \
@@ -8,8 +9,11 @@ SUBDIRS = \
data \
po
+EXTRA_DIST = gnome-doc-utils.make
+
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
- intltool-update
+ intltool-update \
+ gnome-doc-utils.make
View
9 autogen.sh
@@ -64,6 +64,15 @@ check_autotool_version $LIBTOOLIZE 1.4.3
check_autotool_version intltoolize 0.35.0
check_autotool_version pkg-config 0.14.0
+if [ $(pkg-config --modversion gnome-doc-utils 2> /dev/null) ]; then
+ run gnome-doc-prepare --automake --force
+else
+ echo "gnome-doc-utils not found; user help will not be built"
+ echo "AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])])" > build/m4/gnome-doc-utils.m4
+ ACLOCAL_FLAGS="-I build/m4 $ACLOCAL_FLAGS"
+ touch gnome-doc-utils.make
+fi
+
run intltoolize --force --copy
run $LIBTOOLIZE --force --copy --automake
run aclocal -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
View
20 build/m4/shamrock/gnome-doc.m4
@@ -1,6 +1,22 @@
AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS],
[
- GNOME_DOC_INIT([$1], HAVE_GNOME_DOC_UTILS=yes, HAVE_GNOME_DOC_UTILS=no)
+ AC_ARG_ENABLE([user-help],
+ AC_HELP_STRING([--enable-user-help], [Enable building the user-help [[default=auto]]]),,
+ enable_user_help=auto)
- AM_CONDITIONAL(ENABLE_GNOME_DOCS, test "x$HAVE_GNOME_DOC_UTILS" = "xyes")
+ if test "x$enable_user_help" = "xauto"; then
+ PKG_CHECK_MODULES(GNOME_DOC_UTILS,
+ gnome-doc-utils,
+ enable_user_help=yes, enable_user_help=no)
+ elif test "x$enable_user_help" = "xyes"; then
+ PKG_CHECK_MODULES(GNOME_DOC_UTILS, gnome-doc-utils)
+ fi
+
+ if test "x$enable_user_help" = "xyes"; then
+ GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
+ else
+ AM_CONDITIONAL(ENABLE_SK, false)
+ fi
+
+ AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")
])
View
6 configure.ac
@@ -31,6 +31,9 @@ SHAMROCK_EXPAND_LIBDIR
SHAMROCK_EXPAND_BINDIR
SHAMROCK_EXPAND_DATADIR
+dnl Help files
+SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
+
AC_PROG_INSTALL
AC_PATH_PROG(GMCS, gmcs, no)
@@ -96,6 +99,7 @@ build/m4/shave/shave
build/m4/shave/shave-libtool
data/Makefile
data/icons/Makefile
+help/Makefile
FriendFace/Makefile
NotifySharp/Makefile
SparkleDiff/Makefile
@@ -116,5 +120,7 @@ SparkleShare ${VERSION}
Configuration:
Prefix : ${prefix}
Nautilus plugin : ${have_nautilus_python}
+ User Help : ${enable_user_help} (requires gnome-doc-utils >= 0.17.3)
+
"
View
17 help/Makefile.am
@@ -0,0 +1,17 @@
+if HAVE_GNOME_DOC_UTILS
+include $(top_srcdir)/gnome-doc-utils.make
+
+DOC_ID = sparkleshare
+
+DOC_INCLUDES = legal.xml
+
+DOC_PAGES = account-creation.page \
+ advanced.page \
+ index.page \
+ introduction.page \
+ share.page
+
+DOC_LINGUAS =
+
+dist-hook: doc-dist-hook
+endif

0 comments on commit 392c48c

Please sign in to comment.
Something went wrong with that request. Please try again.