NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg_server: cleanup .mk

Browse Source 
Rearrange lines and get rid of unneeded variables. Should have no functional
change.
This commit is contained in:
Peter Korsgaard 2009-03-16 15:47:44 +00:00
parent 0c84c92b13
commit 3e872797d0
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -10,38 +10,7 @@ XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserv
XSERVER_XORG_SERVER_AUTORECONF = NO
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_MESA_DEPS:=mesa3d
XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)"
XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg
else
XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg
endif
ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev --disable-glx --disable-dri
else
XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
XSERVER_XORG_NULL_CURSOR:=--enable-null-root-cursor
else
XSERVER_XORG_NULL_CURSOR:=--disable-null-root-cursor
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y)
XSERVER_XORG_BUILTIN_FONTS:=--enable-builtin-fonts
else
XSERVER_XORG_BUILTIN_FONTS:=--disable-builtin-fonts
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
XSERVER_XORG_AIGLX:=--enable-aiglx
else
XSERVER_XORG_AIGLX:=--disable-aiglx
endif
XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \
xproto_compositeproto xproto_damageproto xproto_fixesproto \
@ -55,18 +24,42 @@ XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont lib
xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \
xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \
xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \
pixman dbus $(XSERVER_XORG_MESA_DEPS) mcookie
pixman dbus mcookie
XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \
--enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \
--disable-config-hal $(XSERVER_XORG_MESA_DIR) \
XSERVER_XORG_SERVER_CONF_OPT = --enable-freetype --disable-config-hal \
--disable-xnest --disable-xephyr --disable-xvfb \
$(XSERVER_XORG_NULL_CURSOR) \
$(XSERVER_XORG_BUILTIN_FONTS) \
$(XSERVER_XORG_AIGLX) \
CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
endif
ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev --disable-glx --disable-dri
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-null-root-cursor
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-aiglx
endif
# Optional packages
ifeq ($(BR2_PACKAGE_TSLIB),y)