gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Petazzoni 2009-07-17 16:26:29 +02:00
parent b36a589480
commit 74ecbaa23d
20 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/Makefile.in
View File

@ -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)))
#"))

2
package/blackbox/blackbox.mk
View File

@ -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))

2
package/cairo/cairo.mk
View File

@ -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

2
package/dillo/dillo.mk
View File

@ -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)

2
package/docker/docker.mk
View File

@ -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))

2
package/fltk/fltk.mk
View File

@ -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))

2
package/games/ace_of_penguins/ace_of_penguins.mk
View File

@ -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))

2
package/java/classpath/classpath.mk
View File

@ -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

2
package/java/jamvm/jamvm.mk
View File

@ -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

2
package/libgtk12/libgtk12.mk
View File

@ -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*

2
package/libgtk2/libgtk2.mk
View File

@ -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

2
package/metacity/metacity.mk
View File

@ -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))

2
package/midori/midori.mk
View File

@ -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))

20
package/pango/pango.mk
View File

@ -40,19 +40,19 @@ 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
ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPT_X = --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
else
PANGO_CONF_OPT_X = --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
PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo
ifeq ($(BR2_PACKAGE_XORG7),y)
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 += --without-x
endif
$(eval $(call AUTOTARGETS,package,pango))

2
package/rdesktop/rdesktop.mk
View File

@ -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)

2
package/rxvt/rxvt.mk
View File

@ -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

2
package/synergy/synergy.mk
View File

@ -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))

2
package/xpdf/xpdf.mk
View File

@ -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" \

1
package/xvkbd/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XVKBD
bool "xvkbd"
depends on BR2_PACKAGE_XORG7
help
on-screen keyboard for X

2
package/xvkbd/xvkbd.mk
View File

@ -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))