- the $(XSERVER) target can be provided by different X server impls. Adjust users

- rdesktop needs an xserver impl

diff --git a/package/Makefile.in b/package/Makefile.in
index f8557f7007ae6d91f2850fa4de133263400707d7..531f8de1fd02b8ae96eb06a5d31dae2c7d716aa2 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -111,3 +111,16 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),)
 TARGET_CONFIGURE_OPTS+=CXX=""
 endif
 
+# X Windowing system
+
+XSERVER:=
+ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
+XSERVER+=tinyx
+endif
+ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
+XSERVER+=xorg
+endif
+ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
+XSERVER+=xggi
+endif
+

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 523c51acbef7e8949ad43a1d63c86b0e898da602..47b06ec55f3c811980bbd65ce9896c2417ad7623 100644 (file)
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -134,7 +134,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
        $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libcairo.so.2.*
        touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
 
-cairo: uclibc gettext libintl pkgconfig libglib2 xorg $(TARGET_DIR)/lib/libcairo.so.2.9.3
+cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
 
 cairo-clean:
        rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)

diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 9ee724c09ea08783deeb08bcb9eb1c9a0dadf0d9..3b70bb1a9223029255b1430724bc0103501acc34 100644 (file)
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -38,7 +38,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo
        $(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install
        touch $(DILLO_DIR)/.installed
 
-dillo: uclibc xorg libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
+dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
 
 dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
 

diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index a96971a8d3a76acd9a7eca80dea5c77d2b696c1e..28e9f62369e37e6bb80438506b3763a84a040c6f 100644 (file)
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -85,7 +85,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
        $(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 xorg $(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-clean:
        rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 0c5f4813f553f30c5e8116d2cf2799dd9ce32742..9cc9f77b315f877092c3528596a1f65647f35f83 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -150,7 +150,7 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
        cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0
        touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
 
-libgtk2: uclibc png jpeg tiff xorg libglib2 \
+libgtk2: uclibc png jpeg tiff $(XSERVER) libglib2 \
        cairo pango atk $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
 
 libgtk2-clean:

diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index e618873a3364c9a9a1d2a8ef6433f1c2d365acff..123605cc00779db82a56be7f54c057bf5ff2add3 100644 (file)
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -138,7 +138,7 @@ $(TARGET_DIR)/lib/*metacity*.so: $(STAGING_DIR)/lib/*metacity*.so
        (cd $(TARGET_DIR)/usr/share/themes; rm -rf Atlanta; ln -s Clearlooks Atlanta)
        cp -a package/metacity/Xsession $(TARGET_DIR)/etc/X11/
 
-metacity: uclibc zlib xorg libgtk2 $(TARGET_DIR)/lib/*metacity*.so
+metacity: uclibc zlib $(XSERVER) libgtk2 $(TARGET_DIR)/lib/*metacity*.so
 
 metacity-clean:
        -$(MAKE) -C $(METACITY_DIR) clean

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index df308e4d68debd3f9b48ee58c9449b747b61487d..26ae3e89fa90313fcda23f8724342206581de9e5 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -154,7 +154,7 @@ $(TARGET_DIR)/lib/libpango-1.0.so.0: $(STAGING_DIR)/lib/$(PANGO_BINARY)
        cp package/pango/pangox.aliases $(TARGET_DIR)/etc/pango/
        touch -c $(TARGET_DIR)/lib/libpango-1.0.so.0
 
-pango: uclibc gettext libintl pkgconfig libglib2 xorg cairo \
+pango: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) cairo \
        $(TARGET_DIR)/lib/libpango-1.0.so.0
 
 pango-clean:

diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index cefa21f15d495880b628938bb108aef815ca9834..20e8a7cc3c4d9f03ac661b1c6a67075fc7954930 100644 (file)
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/.installed: $(RDESKTOP_DIR)/rdesktop
        cp $(RDESKTOP_DIR)/rdesktop $(TARGET_DIR)/usr/bin
        touch $(RDESKTOP_DIR)/.installed
 
-rdesktop: uclibc xorg openssl $(RDESKTOP_DIR)/.installed
+rdesktop: uclibc openssl $(XSERVER) $(RDESKTOP_DIR)/.installed
 
 rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
 

diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk
index 80b86b8438d797e4c1a23378ef2f05a2df3c4a7b..9468ba4ebba688bb85afb0920a6615f38adc5d04 100644 (file)
--- a/package/rxvt/rxvt.mk
+++ b/package/rxvt/rxvt.mk
@@ -63,12 +63,7 @@ $(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY)
        cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin
        (cd $(TARGET_DIR)/usr/X11R6/bin; ln -fs rxvt xterm)
 
-ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
-rxvt: tinyx $(TARGET_DIR)/usr/X11R6/bin/rxvt
-endif
-ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
-rxvt: xorg $(TARGET_DIR)/usr/X11R6/bin/rxvt
-endif
+rxvt: $(XSERVER) $(TARGET_DIR)/usr/X11R6/bin/rxvt
 
 rxvt-clean:
        rm -f $(TARGET_DIR)/usr/X11R6/bin/rxvt

diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index b0c4bc94ff48fb273d20c1f1aed6393667c5555c..6dc3b04618be594d1d27dabe8278fa90074c334d 100644 (file)
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -44,9 +44,9 @@ DEJAVU_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/deja
 DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION)
 
 # Install Xorg xserver
-XSERVER:=Xorg
-XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
-TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
+XSERVER_BINARY:=Xorg
+XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY)
+TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY)
 
 # figure out Xorg's idea of corresponding architecture name
 ifeq ($(BR2_alpha),y)
@@ -127,7 +127,7 @@ $(TARGET_XSERVER): $(XORG_XSERVER)
                $(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \
        done
        cp $(XORG_XSERVER) $(TARGET_XSERVER)
-       (cd $(XORG_BINX); ln -snf $(XSERVER) X)
+       (cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X)
        $(STRIP) $(TARGET_XSERVER)
        mkdir -p $(XORG_LIBX)/modules
        cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/