diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-07-30 11:35:13 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-07-30 11:35:13 +0200 |
| commit | 2c37771b406af67b4973304a4ceaa55cd5e6ff7d (patch) | |
| tree | 98b9620a1bcad8ecc65098a57577506217d42b85 /rules/xorg-server.make | |
| parent | 8ae364ec302a8bc73226758b0d8b1c056a9bdc07 (diff) | |
| download | ptxdist-2c37771b406af67b4973304a4ceaa55cd5e6ff7d.tar.gz ptxdist-2c37771b406af67b4973304a4ceaa55cd5e6ff7d.tar.xz | |
[xorg-server] remove obsolete options
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/xorg-server.make')
| -rw-r--r-- | rules/xorg-server.make | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/rules/xorg-server.make b/rules/xorg-server.make index ea8267a5b..410db0ccb 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -93,13 +93,6 @@ XORG_SERVER_AUTOCONF += --disable-xres endif # default is enabled -ifdef PTXCONF_XORG_SERVER_EXT_XTRAP -XORG_SERVER_AUTOCONF += --enable-xtrap -else -XORG_SERVER_AUTOCONF += --disable-xtrap -endif - -# default is enabled ifdef PTXCONF_XORG_SERVER_EXT_RECORD XORG_SERVER_AUTOCONF += --enable-record else @@ -294,15 +287,6 @@ else XORG_SERVER_AUTOCONF += --disable-xephyr endif -ifdef PTXCONF_XORG_SERVER_XPRINT -XORG_SERVER_AUTOCONF += --enable-xprint -# xprint FreeType backend have to be disabled in the x.org contribution due to -# licence troubels -XORG_SERVER_AUTOCONF += --disable-freetype -else -XORG_SERVER_AUTOCONF += --disable-xprint -endif - ifdef PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID XORG_SERVER_AUTOCONF += --enable-install-setuid else @@ -405,9 +389,6 @@ endif ifdef PTXCONF_XORG_SERVER_XNEST @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xnest/Xnest, $(XORG_PREFIX)/bin/Xnest) endif -ifdef PTXCONF_XORG_SERVER_XPRINT - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xprint/Xprt, $(XORG_PREFIX)/bin/Xprt) -endif ifdef PTXCONF_XORG_SERVER_XWIN @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xwin/Xwin, $(XORG_PREFIX)/bin/Xwin) endif @@ -458,10 +439,6 @@ endif ifdef PTXCONF_XORG_SERVER_EXT_XRES endif -ifdef PTXCONF_XORG_SERVER_EXT_XTRAP - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libxtrap.so ,/usr/lib/xorg/modules/extensions/libxtrap.so) -endif - ifdef PTXCONF_XORG_SERVER_EXT_RECORD @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/librecord.so ,/usr/lib/xorg/modules/extensions/librecord.so) endif @@ -485,7 +462,6 @@ ifdef PTXCONF_XORG_SERVER_EXT_XDMCP_AUTH_1 endif ifdef PTXCONF_XORG_SERVER_EXT_GLX - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libGLcore.so, /usr/lib/xorg/modules/extensions/libGLcore.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libglx.so ,/usr/lib/xorg/modules/extensions/libglx.so) endif |