Remove doc and add %autogen macros

diff --git a/Makefile.am b/Makefile.am
index f5d56e9..b66644d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,13 @@ include $(top_srcdir)/Makefile.decl
 
 ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = build egg libsecret tool po docs .
+SUBDIRS = build egg libsecret tool po .
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-debug=yes \
        --disable-coverage \
        --enable-strict \
        --disable-silent-rules \
-       --enable-gtk-doc \
        --enable-vala
 
 EXTRA_DIST = \

diff --git a/autogen.sh b/autogen.sh
index 3f5fbc7..5a045e0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -93,8 +93,6 @@ $ACLOCAL -I build/m4 $ACLOCAL_FLAGS || exit $?
 libtoolize --force || exit $?
 intltoolize --force --copy || exit $?
 
-gtkdocize || exit $?
-
 autoheader || exit $?
 
 $AUTOMAKE --add-missing || exit $?

diff --git a/configure.ac b/configure.ac
index cefc69e..f72fea0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ PKG_CHECK_MODULES(GLIB,
 LIBS="$LIBS $GLIB_LIBS"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 
-GTK_DOC_CHECK(1.9)
-
 GOBJECT_INTROSPECTION_CHECK([1.29])
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
@@ -259,12 +257,6 @@ AC_SUBST(SECRET_MINOR)
 AC_CONFIG_FILES([
        Makefile
        build/Makefile
-       docs/Makefile
-       docs/man/Makefile
-       docs/reference/Makefile
-       docs/reference/libsecret/Makefile
-       docs/reference/libsecret/version.xml
-       docs/reference/libsecret/version-major.xml
        egg/Makefile
        egg/tests/Makefile
        po/Makefile.in

diff --git a/packaging/libsecret.spec b/packaging/libsecret.spec
index 522eef8..ce65e1a 100644 (file)
--- a/packaging/libsecret.spec
+++ b/packaging/libsecret.spec
@@ -74,6 +74,7 @@ secrets. It communicates with the "Secret Service" using DBus.
 %setup -q
 
 %build
+%autogen
 %configure \
         --disable-static
 make V=1
@@ -104,7 +105,6 @@ rm -rf %{buildroot}%{_datadir}/locales/*
 %files tools
 %defattr(-,root,root)
 %{_bindir}/secret-tool
-%{_mandir}/man1/secret-tool.1%{?ext_man}
 
 %files devel
 %defattr (-, root, root)
@@ -114,7 +114,6 @@ rm -rf %{buildroot}%{_datadir}/locales/*
 %{_includedir}/libsecret-1/
 %{_datadir}/gir-1.0/Secret-1.gir
 %{_datadir}/gir-1.0/SecretUnstable-0.gir
-%doc %{_datadir}/gtk-doc/html/libsecret-1/
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libsecret-1.deps
 %{_datadir}/vala/vapi/libsecret-1.vapi