From e1743894d5a5e90615986c165c7ebc287610bc0a Mon Sep 17 00:00:00 2001 From: Jean-Benoit MARTIN Date: Tue, 18 Dec 2012 17:00:45 +0100 Subject: [PATCH] Remove doc and add %autogen macros --- Makefile.am | 4 +--- autogen.sh | 2 -- configure.ac | 3 --- packaging/libsecret.spec | 3 +-- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 331defa..b640174 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,15 +5,13 @@ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS} SUBDIRS = \ . \ - po \ - docs/reference/libsecret + po DISTCHECK_CONFIGURE_FLAGS = \ --enable-debug=yes \ --disable-coverage \ --disable-strict \ --disable-silent-rules \ - --enable-gtk-doc \ --enable-vala dist-hook: diff --git a/autogen.sh b/autogen.sh index 9f23f79..2f26d4f 100755 --- 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 4f8342e..fad887a 100644 --- a/configure.ac +++ b/configure.ac @@ -273,9 +273,6 @@ AC_SUBST(SECRET_MINOR) AC_CONFIG_FILES([ Makefile - docs/reference/libsecret/Makefile - docs/reference/libsecret/version.xml - docs/reference/libsecret/version-major.xml po/Makefile.in po/Makefile libsecret/libsecret.pc diff --git a/packaging/libsecret.spec b/packaging/libsecret.spec index 522eef8..ce65e1a 100644 --- 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 -- 2.7.4