diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-26 15:36:12 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-12-26 15:36:12 +0000 |
| commit | 87e333010ce13b63b9056aa70443bd14f3653e06 (patch) | |
| tree | 0f634e1555b15395db0752b3258f8bbc1e3ad48d /package/libgtk2/libgtk2.mk | |
| parent | 5c3a6a55e67c1ab4dab4a3031625570ca83804f3 (diff) | |
| download | buildroot-novena-87e333010ce13b63b9056aa70443bd14f3653e06.tar.gz buildroot-novena-87e333010ce13b63b9056aa70443bd14f3653e06.zip | |
libgtk: don't list cups/png/jpeg/tiff as hard dependencies
GTK can be compiled without the above, so don't list them as hard
dependencies, and simply adjust the build depending on what the user
has enabled.
Diffstat (limited to 'package/libgtk2/libgtk2.mk')
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index a521a687d..38926455f 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -79,10 +79,11 @@ LIBGTK2_CONF_OPT = --enable-shared \ $(LIBGTK2_CONF_OPT_X) \ $(LIBGTK2_CONF_OPT_DFB) +LIBGTK2_DEPENDENCIES = pkgconfig libglib2 cairo pango atk ifeq ($(BR2_PACKAGE_DIRECTFB),y) LIBGTK2_CONF_OPT += --with-gdktarget=directfb - LIBGTK2_DEPENDENCIES_EXTRA = directfb + LIBGTK2_DEPENDENCIES += directfb endif ifneq ($(BR2_PACKAGE_XSERVER_none),y) @@ -91,11 +92,34 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y) --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ --with-gdktarget=x11 - LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER) cups + LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER) else LIBGTK2_CONF_OPT += --without-x endif -LIBGTK2_DEPENDENCIES = uclibc pkgconfig libpng jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cairo pango atk + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBGTK2_DEPENDENCIES += libpng +else +LIBGTK2_CONF_OPT += --without-libpng +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LIBGTK2_DEPENDENCIES += jpeg +else +LIBGTK2_CONF_OPT += --without-libjpeg +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +LIBGTK2_DEPENDENCIES += tiff +else +LIBGTK2_CONF_OPT += --without-libtiff +endif + +ifeq ($(BR2_PACKAGE_CUPS),y) +LIBGTK2_DEPENDENCIES += cups +else +LIBGTK2_CONF_OPT += --disable-cups +endif $(eval $(call AUTOTARGETS,package,libgtk2)) |