Commit 74ecbaa2 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

xorg: remove the XSERVER variable 



The XSERVER variable used to be defined by package/Makefile.in because
the X server package name was different depending on the type of X
server that was choosen. Nowadays, the name of the package is always
xserver_xorg-server, so there's no point in having this XSERVER
intermediate variable.

This patch makes all packages use xserver_xorg-server directly as a
dependency, and removes the XSERVER variable from package/Makefile.in.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b36a5894

package/Makefile.in

+0 −6
Original line number Diff line number Diff line
@@ -380,14 +380,8 @@ else 
ENABLE_DEBUG:=

endif





# X Windowing system



XSERVER:=

ifeq ($(BR2_PACKAGE_XORG7),y)

XSERVER+=xserver_xorg-server

endif



X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))

#"))

package/blackbox/blackbox.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES 
BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \

		--x-libraries=$(STAGING_DIR)/usr/lib



BLACKBOX_DEPENDENCIES:=uclibc $(XSERVER)

BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server



$(eval $(call AUTOTARGETS,package,blackbox))

package/cairo/cairo.mk

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ endif 


ifeq ($(BR2_PACKAGE_XORG7),y)

	CAIRO_CONF_OPT += --enable-xlib --with-x

	CAIRO_DEPENDENCIES += $(XSERVER)

	CAIRO_DEPENDENCIES += xserver_xorg-server

else

	CAIRO_CONF_OPT += --disable-xlib --without-x

endif

package/dillo/dillo.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo 
	$(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install

	touch $(DILLO_DIR)/.installed



dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed

dillo: uclibc xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed



dillo-source: $(DL_DIR)/$(DILLO_SOURCE)

package/docker/docker.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \ 


DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install



DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 $(XSERVER)

DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 xserver_xorg-server



$(eval $(call AUTOTARGETS,package,docker))