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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Makefile.in b/package/Makefile.in
index 32aa259faff36f0884a4f0be1065104bab4db2fa..351124410dc55998d4f96e6f5cffc0e08fafcf68 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -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)))
 #"))
 

diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index a85c7535b4d4b8f50db7ff905a5af1dfc90d18f4..371a4a44d24fcf0d6e8f6afced095fab6f2ca6f3 100644 (file)
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -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))

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 7a7e532db20d2da709ceecb845f6fba56ce8e0ac..a0840834f5b0e44845904337de7ae7db4c9e6a4c 100644 (file)
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -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

diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 12d9a5ce16d80c7f2ab297b52ce7e0c59afb3388..1dcfd55577d4cb7addda10fdfcccea80ccbddd79 100644 (file)
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -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)
 

diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 860cd7e81dcf3883d7b476cea7692c30222d82af..3b8c25cfe2bdcf4b7bce1a3c3ec4c8a8d353b623 100644 (file)
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -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))
 

diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index f4a04986e53d2ca2d7b6362ee5931a905afffe1d..9574cb84a5355a0524b7070a0ddfc4e32bf94fa7 100644 (file)
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -18,6 +18,6 @@ FLTK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) --prefix=/usr \
                --sysconfdir=/etc --enable-shared --enable-threads --with-x
 
-FLTK_DEPENDENCIES = uclibc $(XSERVER)
+FLTK_DEPENDENCIES = uclibc xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,fltk))
\ No newline at end of file

diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index 2aaf7aac879ff5e44212dfbdc14e92de4dc9dded..2e4fda6e90d370b9dbd40db0a5b388be01c5fdbb 100644 (file)
--- a/package/games/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES
 ACE_OF_PENGUINS_STAGING = NO
 ACE_OF_PENGUINS_TARGET = YES
 
-ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER)
+ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package/games,ace_of_penguins))

diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index b62e29c1b4b048a9fa2fd4de604a6edfafca12a7..d037adfe67692405fe6c22eda2717b0c8bb3bc15 100644 (file)
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -78,7 +78,7 @@ else
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-       CLASSPATH_DEPENDENCIES+= $(XSERVER)
+       CLASSPATH_DEPENDENCIES+= xserver_xorg-server
        CLASSPATH_CONF_OPT+= --with-x \
                --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --x-libraries=$(STAGING_DIR)/usr/lib

diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 92ae4a6d72c4cecab0fecc4e0d3b6789ffad88cb..750bfae239589d8c8066b956dad897fb0b800a46 100644 (file)
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -53,7 +53,7 @@ JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath
 
 #Include X libraries when we have an X server
 ifeq ($(BR2_PACKAGE_XORG7),y)
-       JAMVM_DEPENDENCIES+= $(XSERVER)
+       JAMVM_DEPENDENCIES+= xserver_xorg-server
        JAMVM_CONF_OPT+= --with-x \
                --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --x-libraries=$(STAGING_DIR)/usr/lib

diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index a578ae8ae42568dbb0c172eb37c5d54552c762eb..bb121f01dbc622d3da643f6f26c032c3c28c81ba 100644 (file)
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -86,7 +86,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
        $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
        touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
 
-libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
+libgtk12: uclibc libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
 
 libgtk12-clean:
        rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 5c9e542042791d21049d3980a07f4b069cc0a518..3b85f634655c16fc28627cdbc20abc9c02d79968 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -91,7 +91,7 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
                --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --x-libraries=$(STAGING_DIR)/usr/lib \
                --with-gdktarget=x11
-       LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER)
+       LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server
 else
        LIBGTK2_CONF_OPT += --without-x
 endif

diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index d5d5bb7b05781f655c38ed923f3a9c24488c5407..6861165e401a3c62236e5f783e80800745e53e8d 100644 (file)
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -16,7 +16,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --disable-dependency-tracking \
                --disable-sm --disable-startup-notification
 
-METACITY_DEPENDENCIES = uclibc libgtk2 $(XSERVER)
+METACITY_DEPENDENCIES = uclibc libgtk2 xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,metacity))
 

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 805b0287a715d9c4ebb7e268c3f15f88e7cea677..6861d4c297c5438f53f0d2fb91c27ae9f0a915b2 100644 (file)
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES
 MIDORI_INSTALL_STAGING = NO
 MIDORI_INSTALL_TARGET = YES
 
-MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy $(XSERVER)
+MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,midori))

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 8cccae65f7959ee75876b535cc0d57da7ab1b4a9..2bcebf3b7b3ccfad2161a007fc5cc428b49a1b91 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,20 +40,20 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                ac_use_included_regex=no gl_cv_c_restrict=no \
                ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 
+PANGO_CONF_OPT = --enable-shared --enable-static \
+               --enable-explicit-deps=no --disable-debug
+
+PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo
+
 ifeq ($(BR2_PACKAGE_XORG7),y)
-        PANGO_CONF_OPT_X = --with-x \
+        PANGO_CONF_OPT += --with-x \
                --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
+       PANGO_DEPENDENCIES += xserver_xorg-server
 else
-        PANGO_CONF_OPT_X = --without-x
+        PANGO_CONF_OPT += --without-x
 endif
 
-PANGO_CONF_OPT = --enable-shared --enable-static \
-               $(PANGO_CONF_OPT_X) \
-               --enable-explicit-deps=no --disable-debug
-
-PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) cairo
-
 $(eval $(call AUTOTARGETS,package,pango))
 
 $(PANGO_HOOK_POST_INSTALL):

diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index 63be0b8b587bf1b437ca467b289b1775a93798d0..e94fd77ed3935459b6afd3b11b6c10812ceb57a2 100644 (file)
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured
 $(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop
        cp $^ $@
 
-rdesktop: uclibc openssl $(XSERVER) $(TARGET_DIR)/usr/bin/rdesktop
+rdesktop: uclibc openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop
 
 rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
 

diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk
index 1a0a82636104655855fb97af82a5c232b3fef044..14d08d2131367d2be84192c7a86a91a0236eee89 100644 (file)
--- a/package/rxvt/rxvt.mk
+++ b/package/rxvt/rxvt.mk
@@ -65,7 +65,7 @@ $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt: $(RXVT_BINARY)
        $(INSTALL) -m 0755 -D $^ $@
        (cd $(@D); ln -fs rxvt xterm)
 
-rxvt: $(XSERVER) $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
+rxvt: xserver_xorg-server $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
 
 rxvt-clean:
        rm -f $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt

diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index b89f3cd40e34736c0c56013df5c1b523066e1a4e..763e57b0c477a553785ab8dda6ed511dd7b1dbe6 100644 (file)
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -14,6 +14,6 @@ SYNERGY_INSTALL_TARGET = YES
 SYNERGY_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
 
-SYNERGY_DEPENDENCIES = uclibc $(XSERVER)
+SYNERGY_DEPENDENCIES = uclibc xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,synergy))

diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk
index 1f09a9d50389aa96312c8a93c12d0f6de8fd150f..ab60b2be5c957e23bc2f955e8549d8cad1bec093 100644 (file)
--- a/package/xpdf/xpdf.mk
+++ b/package/xpdf/xpdf.mk
@@ -18,7 +18,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-       XPDF_DEPENDENCIES += $(XSERVER) openmotif
+       XPDF_DEPENDENCIES += xserver_xorg-server openmotif
        XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
                                        --with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \
                                        --with-freetype2-library=$(STAGING_DIR)/usr/lib CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" \

diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in
index eeef152cb251dd21da6c682c022976e660166b8a..888367a2df529b961e1e4297e6305a9efcf87ba3 100644 (file)
--- a/package/xvkbd/Config.in
+++ b/package/xvkbd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XVKBD
        bool "xvkbd"
+       depends on BR2_PACKAGE_XORG7
        help
          on-screen keyboard for X
 

diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 510e3c402305603e59e13186abb0d928603ad118..d28780969eb3fb04e6aa9510f229112f52d3be71 100644 (file)
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \
 
 XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-XVKBD_DEPENDENCIES = uclibc $(XSERVER)
+XVKBD_DEPENDENCIES = uclibc xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,xvkbd))