[gnome-color-manager/gnome-3-0] Remove the gtk-doc support



commit c4f3fdce8fbb4a003bb7cacd77702a51ed296234
Author: Richard Hughes <richard hughsie com>
Date:   Mon Mar 21 12:40:24 2011 +0000

    Remove the gtk-doc support
    
    We don't want people to use this library; it's gone in 3.2...

 Makefile.am                         |    2 +-
 autogen.sh                          |    2 -
 configure.ac                        |    7 +---
 contrib/gnome-color-manager.spec.in |    1 -
 docs/Makefile.am                    |    3 +-
 docs/api/.gitignore                 |   25 -----------
 docs/api/Makefile.am                |   74 --------------------------------
 docs/api/clean.sh                   |    7 ---
 docs/api/libcolor-glib-docs.sgml    |   80 -----------------------------------
 docs/api/version.xml.in             |    1 -
 10 files changed, 3 insertions(+), 199 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3dcc91b..4d23f88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST =						\
 	config.h
 
 DISTCHECK_CONFIGURE_FLAGS = 				\
-	--enable-gtk-doc --disable-tests
+	--disable-tests
 
 distclean-local:
 	if test $(srdcir) = .; then :; else \
diff --git a/autogen.sh b/autogen.sh
index ba87bc0..16bbd82 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,6 +23,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-(cd $srcdir && gtkdocize) || exit 1
-
 REQUIRED_AUTOMAKE_VERSION=1.7 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 8a69b6c..46fc94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.63)
 
 m4_define([gcm_major_version], [2])
 m4_define([gcm_minor_version], [91])
-m4_define([gcm_micro_version], [91])
+m4_define([gcm_micro_version], [92])
 m4_define([gcm_version],
           [gcm_major_version.gcm_minor_version.gcm_micro_version])
 
@@ -54,9 +54,6 @@ IT_PROG_INTLTOOL([0.35.0])
 GNOME_COMPILE_WARNINGS(error)
 GNOME_DOC_INIT
 
-# set up gtk-doc
-GTK_DOC_CHECK(1.9)
-
 dnl ---------------------------------------------------------------------------
 dnl - Use strict options (default enabled for devs, disabled in releases)
 dnl ---------------------------------------------------------------------------
@@ -321,8 +318,6 @@ session/Makefile
 tools/Makefile
 docs/Makefile
 docs/huey/Makefile
-docs/api/Makefile
-docs/api/version.xml
 libcolor-glib/Makefile
 libcolor-glib/gcm-version.h
 libcolor-glib/libcolor-glib.pc
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index 62c19c0..db4ed09 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -124,7 +124,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_libdir}/libcolor-glib.so.1
 %{_libdir}/libcolor-glib.so.1.0.0
 %{_libdir}/pkgconfig/libcolor-glib.pc
-%{_datadir}/gtk-doc/html/libcolor-glib
 %{_libdir}/gnome-settings-daemon-2.0/color.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-2.0/libcolor.so
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 36fa18c..a4bd529 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = 						\
-	huey						\
-	api
+	huey
 
 INCLUDES =							\
 	-I$(top_srcdir)/libcolor-glib				\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]