Changeset 13702

Timestamp:

2008-12-20T22:17:43+01:00 (9 years ago)

Author:

mirko

Message:

cleanup Makefile and enable DRI/DRM

File:

• packages/Xorg/xorg/xserver/xorg-server/Makefile (modified) (5 diffs)

packages/Xorg/xorg/xserver/xorg-server/Makefile

@@ -119 +119 @@
 
 define Package/xorg/Default
+  PROVIDES:=xserver
   SECTION:=xorg-server
   CATEGORY:=Xorg
@@ -145 +146 @@
   PROVIDES:=xserver
   TITLE:=Xorg xserver
-endef
-
-define Package/xserver-kdrive-xvesa
+  DEPENDS+=+libdrm \
+  +xf86driproto
+endef
+
+define Package/xserver-kdrive/Default
 $(call Package/xserver/Default)
-  PROVIDES:=xserver
-  TITLE:=Kdrive vesa xserver
-  DEPENDS+=@TARGET_x86 \
-  +X_TSLIB:tslib \
-  +X_DRI:xf86driproto \
-  +X_DRI:libdrm \
-  +X_XCALIBRATE:calibrateproto \
-  +X_COMPOSITE:compositeproto \
-  +X_XINERAMA:xineramaproto
-endef
-
-define Package/xserver-kdrive-xfbdev
-$(call Package/xserver/Default)
-  PROVIDES:=xserver
-  TITLE:=Kdrive framebuffer xserver
   DEPENDS+=+X_TSLIB:tslib \
   +X_DRI:xf86driproto \
@@ -172 +160 @@
 endef
 
+define Package/xserver-kdrive-xvesa
+$(call Package/xserver-kdrive/Default)
+  TITLE:=Kdrive vesa xserver
+  DEPENDS+=@TARGET_x86
+endef
+
+define Package/xserver-kdrive-xfbdev
+$(call Package/xserver-kdrive/Default)
+  TITLE:=Kdrive framebuffer xserver
+endef
+
 define Package/xserver-kdrive-xephyr
-$(call Package/xserver/Default)
-  PROVIDES:=xserver
+$(call Package/xserver-kdrive/Default)
   TITLE:=Kdrive ephyr xserver
-  DEPENDS+=+X_TSLIB:tslib \
-  +X_DRI:xf86driproto \
-  +X_DRI:libdrm \
-  +X_XCALIBRATE:calibrateproto \
-  +X_COMPOSITE:compositeproto \
-  +X_XINERAMA:xineramaproto
 endef
 
@@ -197 +189 @@
 define Build/Configure
         $(call Build/Configure/Default, \
-                $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --disable-kdrive,--disable-xorg --enable-kdrive) \
+                $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --enable-dri,--disable-xorg --disable-dri) \
                 $(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
                         --enable-kdrive-vesa, \
@@ -210 +202 @@
                 $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
                 $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \
-                $(if $(CONFIG_X_DRI),--enable-dri,--disable-dri) \
                 $(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \
         )