From 5c04443f07d4bb4b85dff8189af636118a2a1d50 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 17 Jul 2000 16:38:16 +0000 Subject: [PATCH] use conditional for X git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8689 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/kx/Makefile.am | 27 +++++++++++++-------------- appl/xnlock/Makefile.am | 13 ++++++++----- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am index e55ba17b8..983134f23 100644 --- a/appl/kx/Makefile.am +++ b/appl/kx/Makefile.am @@ -6,23 +6,22 @@ INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) WFLAGS += $(WFLAGS_NOIMPLICITINT) -X_PROGS_BIN_PROGS = kx -X_PROGS_BIN_SCRPTS = rxterm rxtelnet tenletxr -X_PROGS_LIBEXEC_PROGS = kxd +if HAVE_X + +bin_PROGRAMS = kx +bin_SCRIPTS = rxterm rxtelnet tenletxr +libexec_PROGRAMS = kxd + +else + +bin_PROGRAMS = +bin_SCRIPTS = +libexec_PROGRAMS = + +endif CLEANFILES = rxterm rxtelnet tenletxr -MAKE_X_PROGS_BIN_PROGS = @MAKE_X_PROGS_BIN_PROGS@ -MAKE_X_PROGS_BIN_SCRPTS = @MAKE_X_PROGS_BIN_SCRPTS@ -MAKE_X_PROGS_LIBEXEC_PROGS = @MAKE_X_PROGS_LIBEXEC_PROGS@ - -bin_PROGRAMS = $(MAKE_X_PROGS_BIN_PROGS) -bin_SCRIPTS = $(MAKE_X_PROGS_BIN_SCRPTS) -libexec_PROGRAMS = $(MAKE_X_PROGS_LIBEXEC_PROGS) - -EXTRA_PROGRAMS = $(X_PROGS_BIN_PROGS) $(X_PROGS_LIBEXEC_PROGS) -EXTRA_SCRIPTS = $(X_PROGS_BIN_SCRPTS) - if NEED_WRITEAUTH XauWriteAuth_c = writeauth.c endif diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index f49f811a5..a6ab5b363 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -6,15 +6,18 @@ INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) WFLAGS += $(WFLAGS_NOIMPLICITINT) -X_PROGS_BIN_PROGS = xnlock +if HAVE_X -MAKE_X_PROGS_BIN_PROGS = @MAKE_X_PROGS_BIN_PROGS@ +bin_PROGRAMS = xnlock + +else + +bin_PROGRAMS = + +endif -bin_PROGRAMS = $(MAKE_X_PROGS_BIN_PROGS) man1_MANS = xnlock.man -EXTRA_PROGRAMS = $(X_PROGS_BIN_PROGS) - EXTRA_DIST = $(man1_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \ nose.down nose.front nose.left.front nose.right.front