Easier with one place for configure options for disabling gtk-doc

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 6753f68b18755df94246a1c3f2ab2b09c34acd72..72e4c599c15b13e78c960466684d95cfbaaa3610 100644 (file)
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -248,6 +248,7 @@ $(BUILD_DIR)/%/.stamp_configured:
                --prefix=/usr \
                --exec-prefix=/usr \
                --sysconfdir=/etc \
+               $(DISABLE_DOCUMENTATION) \
                $(QUIET) $($(PKG)_CONF_OPT)
        $(Q)touch $@
 

diff --git a/package/Makefile.in b/package/Makefile.in
index f11b396a1c40fa7d9e2d277f13dddab81ddc6d0e..a5be4d7b06fc0cea505f3a0e3846bac18b19e7c3 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -345,6 +345,10 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
+endif
+
 ifneq ($(BR2_INET_IPV6),y)
 DISABLE_IPV6= --disable-ipv6
 endif

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 5ee52f19d87054a77120c274dfff1ce015d83d3a..99893ea98158328e37f7d0f12306a0b100288853 100644 (file)
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -46,7 +46,6 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y)
        CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
        CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
-CAIRO_CONF_OPT += --disable-gtk-doc --without-html-dir
 
 CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c380e6edeb197d680a891cbf2f4109414ad0874f..db4d92e4fdbaa05b726d2ad72ed72b2626bfa924 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -48,8 +48,6 @@ LIBGLIB2_CONF_ENV =   \
                gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 LIBGLIB2_CONF_OPT = --enable-shared \
-               --disable-gtk-doc \
-               --with-html-dir=/dev/null \
                --enable-static
 
 LIBGLIB2_DEPENDENCIES = uclibc gettext libintl pkgconfig

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 57a0b90ac8718643ce99054475c9559fd245c0e1..6532b542a706a4c05e20c7ae3742b470431cc345 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -75,6 +75,7 @@ LIBGTK2_CONF_OPT = --enable-shared \
                --disable-glibtest \
                --enable-explicit-deps=no \
                --disable-debug \
+               --without-html-dir \
                $(DISABLE_LARGEFILE) \
                $(LIBGTK2_CONF_OPT_X)  \
                $(LIBGTK2_CONF_OPT_DFB)