diff options
author | Mario Blättermann <mario.blaettermann@gmail.com> | 2012-09-23 15:45:10 +0200 |
---|---|---|
committer | Mario Blättermann <mario.blaettermann@gmail.com> | 2012-09-23 15:45:10 +0200 |
commit | 431595191971940954bc843973cee1a2466cecac (patch) | |
tree | 0c6cab23e1211011de7ce35dfc1cab04ffa64902 | |
parent | 35637bb33b5cbe5b4937cf6bd328b0d232a9d687 (diff) |
First try to migrate to itstool
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | help/Makefile.am | 12 |
4 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 0aec6e1..6437d14 100644 --- 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 \ @@ -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 1f05a03..4af43da 100644 --- 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 08e8cf9..814eb3c 100644 --- 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 |