First try to migrate to itstool

diff --git a/Makefile.am b/Makefile.am
index 0aec6e1bdfeba6987aa0ed53e08c1a3f7069e0fe..6437d14d24d03c180830e8cea5e7909fc574fd47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,10 @@ EXTRA_DIST = \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
-       gnome-doc-utils.make \
        glabels.spec.in \
        glabels.spec
 
-DISTCLEANFILES = gnome-doc-utils.make
+DISTCLEANFILES = 
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-scrollkeeper  \

diff --git a/autogen.sh b/autogen.sh
index 307c3311fb15ba5ab635fceafe120f6578556a5c..2dd040ac6afe14ee8f05745da9be4a5258824338 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,5 +18,5 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+
 

diff --git a/configure.ac b/configure.ac
index 1f05a038746485c25a106ac0a72a9d8fdc2961c6..4af43da88dfa6495f59e7cbd264ed1caae437567 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ PKG_PROG_PKG_CONFIG
 
 LT_INIT
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GTK_DOC_CHECK(1.0)
 
 GLIB_GSETTINGS

diff --git a/help/Makefile.am b/help/Makefile.am
index 08e8cf947438faf24530091b0a2a2cbd51eb5b63..814eb3cbaa33e1e80d9f38d251fa7883dfa94520 100644 (file)
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+@YELP_HELP_RULES@
 
-dist-hook: doc-dist-hook
-
-DOC_ID = $(GLABELS_BRANCH)
-DOC_FIGURES = \
+HELP_ID = $(GLABELS_BRANCH)
+HELP_MEDIA = \
        figures/glabels-logo.png                        \
        figures/glabels-template-cd-label.png           \
        figures/glabels-template-circle-label.png       \
@@ -25,7 +23,7 @@ DOC_FIGURES = \
        figures/skip-fields-output.png                  \
        figures/skip-fields-screenshot.png
 
-DOC_PAGES = \
+HELP_FILES = \
        about.page              \
        basicusage.page         \
        createnew.page          \
@@ -48,4 +46,4 @@ DOC_PAGES = \
        select.page             \
        skipfields.page
 
-DOC_LINGUAS = cs de el es fr id nl ru sl
+HELP_LINGUAS = cs de el es fr id nl ru sl