deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fluxbox: explicitly configure optional dependencies

Browse source 
The following commit explicitly configures optional dependencies based
off the respective package selections for a given configuration.

In addition, this commit also cleans up some obsolete/incorrect
arguments. With the introduction of (at least) Fluxbox 1.3.7, the
'--with-imlib2-prefix' argument no longer exists. The argument
'--with-xpm-prefix' has never existed; it was accidentally committed
mimicking the configuration used to provide imlib2.

Signed-off-by: James Knight <james.knight@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
James Knight 2015-06-19 13:17:45 -04:00 committed by Thomas Petazzoni
parent accaa7f487
commit 5465107eef
1 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
package/fluxbox/fluxbox.mk
View file

@ -15,20 +15,69 @@ FLUXBOX_CONF_OPTS = \
--x-libraries=$(STAGING_DIR)/usr/lib
FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifeq ($(BR2_PACKAGE_FREETYPE),y)
FLUXBOX_CONF_OPTS += --enable-freetype2
FLUXBOX_DEPENDENCIES += freetype
else
FLUXBOX_CONF_OPTS += --disable-freetype2
endif
ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
FLUXBOX_CONF_OPTS += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
FLUXBOX_CONF_OPTS += --enable-imlib2
FLUXBOX_DEPENDENCIES += imlib2
else
FLUXBOX_CONF_OPTS += --disable-imlib2
endif
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
FLUXBOX_CONF_OPTS += --enable-fribidi
FLUXBOX_DEPENDENCIES += libfribidi
else
FLUXBOX_CONF_OPTS += --disable-fribidi
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
FLUXBOX_CONF_OPTS += --enable-xft
FLUXBOX_DEPENDENCIES += xlib_libXft
else
FLUXBOX_CONF_OPTS += --disable-xft
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
FLUXBOX_CONF_OPTS += --enable-xrender
FLUXBOX_DEPENDENCIES += xlib_libXrender
else
FLUXBOX_CONF_OPTS += --disable-xrender
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
FLUXBOX_CONF_OPTS += --enable-xpm --with-xpm-prefix=$(STAGING_DIR)/usr
FLUXBOX_CONF_OPTS += --enable-xpm
FLUXBOX_DEPENDENCIES += xlib_libXpm
else
FLUXBOX_CONF_OPTS += --disable-xpm
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
FLUXBOX_CONF_OPTS += --enable-xinerama
FLUXBOX_DEPENDENCIES += xlib_libXinerama
else
FLUXBOX_CONF_OPTS += --disable-xinerama
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
FLUXBOX_CONF_OPTS += --enable-xext
FLUXBOX_DEPENDENCIES += xlib_libXext
else
FLUXBOX_CONF_OPTS += --disable-xext
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
FLUXBOX_CONF_OPTS += --enable-xrandr
FLUXBOX_DEPENDENCIES += xlib_libXrandr
else
FLUXBOX_CONF_OPTS += --disable-xrandr
endif
define FLUXBOX_INSTALL_XSESSION_FILE
$(INSTALL) -m 0755 -D package/fluxbox/xsession \
$(TARGET_DIR)/root/.xsession