diff options
| author | Thomas Lundquist <lists@zelow.no> | 2009-01-17 10:11:12 +0000 |
|---|---|---|
| committer | Thomas Lundquist <lists@zelow.no> | 2009-01-17 10:11:12 +0000 |
| commit | fa2273f409f7197ef47e4cdde83e2d8948156eb7 (patch) | |
| tree | 83655dd373f203fecd5c8d6185bc72a489534ed0 | |
| parent | 22ba8bcf0e901d568556a2448efa8ebfcf698362 (diff) | |
Easier with one place for configure options for disabling gtk-doc
| -rw-r--r-- | package/Makefile.autotools.in | 1 | ||||
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | package/cairo/cairo.mk | 1 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 2 | ||||
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 6753f68b1..72e4c599c 100644 --- 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 f11b396a1..a5be4d7b0 100644 --- 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 5ee52f19d..99893ea98 100644 --- 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 c380e6ede..db4d92e4f 100644 --- 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 57a0b90ac..6532b542a 100644 --- 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) |