diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 15:06:21 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 15:06:21 +0000 |
| commit | 3de6ed6d1a7a521dde59f9c3db1e28a76d6d7475 (patch) | |
| tree | d0089a2c3400c049a5e762afba5a0c018a81dd75 /rules/xorg-app-xdm.make | |
| parent | b58a50540b87f5574056a28fc1f84fded879c10e (diff) | |
| download | ptxdist-3de6ed6d1a7a521dde59f9c3db1e28a76d6d7475.tar.gz ptxdist-3de6ed6d1a7a521dde59f9c3db1e28a76d6d7475.tar.xz | |
* xorg-app-xdm.make
use XORG_OPTIONS_TRANS
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6835 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xorg-app-xdm.make')
| -rw-r--r-- | rules/xorg-app-xdm.make | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make index b4c043598..6fe9fff31 100644 --- a/rules/xorg-app-xdm.make +++ b/rules/xorg-app-xdm.make @@ -64,25 +64,11 @@ XORG_APP_XDM_ENV := $(CROSS_ENV) # # autoconf # -XORG_APP_XDM_AUTOCONF := $(CROSS_AUTOCONF_USR) - -ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX -XORG_APP_XDM_AUTOCONF += --enable-unix-transport -else -XORG_APP_XDM_AUTOCONF += --disable-unix-transport -endif - -ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP -XORG_APP_XDM_AUTOCONF += --enable-tcp-transport -else -XORG_APP_XDM_AUTOCONF += --disable-tcp-transport -endif - -ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6 -XORG_APP_XDM_AUTOCONF += --enable-IPv6 -else -XORG_APP_XDM_AUTOCONF += --disable-IPv6 -endif +XORG_APP_XDM_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + $(XORG_OPTIONS_TRANS) \ + --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) \ + --with-random-device=$(XORG_APP_XDM_DEV_RANDOM) ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC XORG_APP_XDM_AUTOCONF += --enable-secure-rpc @@ -90,9 +76,6 @@ else XORG_APP_XDM_AUTOCONF += --disable-secure-rpc endif -XORG_APP_XDM_AUTOCONF += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) -XORG_APP_XDM_AUTOCONF += --with-random-device=$(XORG_APP_XDM_DEV_RANDOM) - XORG_APP_XDM_AUTOCONF += --enable-xpm-logos # Display xpm logos in greeter XORG_APP_XDM_AUTOCONF += --disable-xprint # FIXME XPrint support XORG_APP_XDM_AUTOCONF += --enable-dynamic-greeter # Build greeter as dynamically loaded shared object @@ -115,7 +98,7 @@ xorg-app-xdm_compile: $(STATEDIR)/xorg-app-xdm.compile $(STATEDIR)/xorg-app-xdm.compile: $(xorg-app-xdm_compile_deps_default) @$(call targetinfo, $@) - cd $(XORG_APP_XDM_DIR) && $(XORG_APP_XDM_PATH) make + cd $(XORG_APP_XDM_DIR) && $(XORG_APP_XDM_PATH) $(MAKE) @$(call touch, $@) # ---------------------------------------------------------------------------- |