Use new Athena imake rules

13 files changed, 51 insertions, 175 deletions

diff --git a/clients/Imakefile b/clients/Imakefile
index 9cc0878..c657507 100644
--- a/clients/Imakefile
+++ b/clients/Imakefile
@@ -1,4 +1,4 @@
-/**/#	Copyright 1988 Massachusetts Institute of Technology.
+/**/#	Copyright 1988, 1993 Massachusetts Institute of Technology.
 /**/#
 /**/#	For copying and distribution information, see the file
 /**/#	"mit-copyright.h". 
@@ -7,43 +7,14 @@
 /**/#	$Author$
 /**/#	$Header$
 /**/#
-#define have_subdirs
-#define no_curdir_lint
-
-SRCDIR= ${SRCTOP}/clients
-CODE= Imakefile ${SHELLSRC}
-
-#ifdef DO_SYSLOG
-SYSLOGD= syslogd
-#else /* !DO_SYSLOG */
-SYSLOGD=
-#endif
 
 #ifndef X11_NO_XAW
 XZWRITE=xzwrite
 #endif
-
 #if defined(HESIOD) && defined(KERBEROS)
 ZMAILNOTIFY= zmailnotify
-#else /* !HESIOD || !KERBEROS */
-/* zmailnotify will only compile properly with Hesiod and Kerberos, so
-   there is no sense in building it when either is not in use. */
-ZMAILNOTIFY=
-#endif /* HESIOD && KERBEROS */
-
-SUBDIRS = zaway zctl zleave zlocate \
-	$(ZMAILNOTIFY) znol zpopnotify zshutdown_notify zstat zwrite \
-	$(SYSLOGD) $(XZWRITE)
-
-#ifdef OLD_ATHENA_COMPAT
-SHELLSCRIPTS= zlogout zhide zwgc
-SHELLSRC= zlogout.sh zhide.sh zwgc.sh
-
-install_shell_scripts(SHELLSCRIPTS,$(CLIENTDIR))
-
-install::
-	rm -f ${DESTDIR}${CLIENTDIR}/zlogin
-	ln -s zlogout ${DESTDIR}${CLIENTDIR}/zlogin
-#else
-SHELLSRC=
 #endif
+
+#define ISUBDIRS zaway zctl zleave zlocate znol \
+	zmailnotify zpopnotify zshutdown_notify zstat zwrite \
+	syslogd xzwrite
diff --git a/clients/syslogd/Imakefile b/clients/syslogd/Imakefile
index abcee39..3e7eedf 100644
--- a/clients/syslogd/Imakefile
+++ b/clients/syslogd/Imakefile
@@ -9,32 +9,22 @@
 /**/#
 
 #ifdef _AIX
-LIBS= $(ZEPHYR_LIB) $(KRB_LIB) $(COMERR_LIB) -lsrc
-#else
-LIBS= $(ZEPHYR_LIB) $(KRB_LIB) $(COMERR_LIB)
+MACHLIBS= -lsrc
 #endif
-LINCLUDES=-I.
-LINTLIBS=$(ZEPHYR_LINTLIB) $(KRB_LINTLIB) $(COMERR_LINTLIB)
-SRCS = syslogd.c
-OBJS = syslogd.o
-HDRS= syslog.h
 
-TSRCS= logger.c syslog.c 
-TOBJS= logger.o syslog.o
+LIBS= $(ZLIBS) $(MACHLIBS)
 
-SRCDIR= ${SRCTOP}/clients/syslogd
-CODE= ${SRCS} ${HDRS} ${TSRCS} Imakefile
+SRCS = syslogd.c logger.c syslog.c 
 
-#ifdef SYSLOG_COMPAT42
-DEFINES = -DCOMPAT42
-#endif
-
-normal_obj_rule()
+DOBJS = syslogd.o
+LOBJS= logger.o syslog.o
 
 #ifdef SYSLOG_COMPAT42
-genutil(logger, $(TOBJS),,)
+COMPAT = -DCOMPAT42
+SimpleProgram(logger,$(LOBJS),,$(ATHETCDIR))
 #endif
 
-program(syslogd,$(OBJS),,$(LIBS),$(ETCATHDIR))
+XDEFS = -I. $(COMPAT)
 
-manpage(8,syslogd.8)
+SimpleProgram(syslogd,$(DOBJS),$(LIBS),$(ATHRETCDIR))
+install_man(syslogd.8,syslogd.8)
diff --git a/clients/xzwrite/Imakefile b/clients/xzwrite/Imakefile
index 3dcae1e..16d9853 100644
--- a/clients/xzwrite/Imakefile
+++ b/clients/xzwrite/Imakefile
@@ -8,11 +8,6 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} $(DYN_LIB) ${COMERR_LIB} \
-	${XAW_LIB} ${XMU_LIB} ${XT_LIB} ${X11_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} \
-	$(DYN_LINTLIB) ${COMERR_LINTLIB}
-
 SRCS	= interface.c resource.c destlist.c util.c bfgets.c \
 	gethomedir.c dest_window.c xzwrite.c edit_window.c zephyr.c\
 	GetString.c Popup.c yank.c menu_window.c logins.c
@@ -21,22 +16,13 @@ OBJS	= interface.o resource.o destlist.o util.o bfgets.o \
 	gethomedir.o dest_window.o xzwrite.o edit_window.o zephyr.o\
 	GetString.o Popup.o yank.o menu_window.o logins.o
 
-HDRS	= GetString.h associate.h xzwrite.h xzwrite-proto.h
-
-SRCDIR= ${SRCTOP}/clients/xzwrite
-CODE= ${SRCS} ${HDRS} Imakefile xzwrite.1 XZwrite xzwrite.bitmap
-DEFINES=-DXZWRITE_SEARCH_PATHS=\"$(ACLDIR)/%N\"
-
-normal_obj_rule()
-
-program(xzwrite,${OBJS},,${LIBS},${CLIENTDIR})
+XDEFS=-DXZWRITE_SEARCH_PATHS=\"$(ZLIBDIR)/%N\"
 
-manpage(1,xzwrite.1)
+zprogram(xzwrite,$(DYN_LIB) $(LIB_XAW))
+install_man(xzwrite.1,xzwrite.1)
+install_file(xzwrite.bitmap,$(ZLIBDIR))
 
 install::
-	-mkdir $(DESTDIR)$(ACLDIR)
-	$(RM) $(DESTDIR)$(ACLDIR)/XZwrite
-	sed -e "s,ACLDIR,$(ACLDIR)," < XZwrite \
-					> $(DESTDIR)$(ACLDIR)/XZwrite
-	$(RM) $(DESTDIR)$(ACLDIR)/xzwrite.bitmap
-	$(CP) xzwrite.bitmap $(DESTDIR)$(ACLDIR)/xzwrite.bitmap
+	$(RM) $(DESTDIR)$(ZLIBDIR)/XZwrite
+	sed -e "s,ACLDIR,$(ZLIBDIR)," \
+		< XZwrite > $(DESTDIR)$(ZLIBDIR)/XZwrite
diff --git a/clients/zaway/Imakefile b/clients/zaway/Imakefile
index f90b488..aabe953 100644
--- a/clients/zaway/Imakefile
+++ b/clients/zaway/Imakefile
@@ -8,14 +8,8 @@
 /**/#	$Header$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zaway.c
 OBJS = zaway.o
 
-SRCDIR= ${SRCTOP}/clients/zaway
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zaway,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zaway,)
+install_man(zaway.1,zaway.1)
diff --git a/clients/zctl/Imakefile b/clients/zctl/Imakefile
index 493f847..69418d6 100644
--- a/clients/zctl/Imakefile
+++ b/clients/zctl/Imakefile
@@ -8,22 +8,9 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${SS_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${SS_LINTLIB} ${KRB_LINTLIB} \
-	${DES_LINTLIB} ${COMERR_LINTLIB}
-SRCS = zctl.c
+SRCS = zctl.c zctl_cmds.c
 OBJS = zctl.o zctl_cmds.o
-OTHERSRCS= zctl_cmds.ct
 
-#ifdef LOCAL_LIBS
-LINCLUDES=-I$(BUILDTOP)/ss
-#endif
-
-SRCDIR= ${SRCTOP}/clients/zctl
-CODE= ${OTHERSRCS} ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zctl,${OBJS},,${LIBS},${CLIENTDIR})
-
-command_table_noprof(zctl_cmds)
+cmd_table(zctl_cmds)
+zprogram(zctl,$(LIB_SS))
+install_man(zctl.1,zctl.1)
diff --git a/clients/zleave/Imakefile b/clients/zleave/Imakefile
index 89270c0..aae9ed2 100644
--- a/clients/zleave/Imakefile
+++ b/clients/zleave/Imakefile
@@ -8,14 +8,8 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${COMERR_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB} ${DES_LINTLIB}
 SRCS = zleave.c
 OBJS = zleave.o
 
-SRCDIR= ${SRCTOP}/clients/zleave
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zleave,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zleave,)
+install_man(zleave.1,zleave.1)
diff --git a/clients/zlocate/Imakefile b/clients/zlocate/Imakefile
index e3fd3e7..291d74a 100644
--- a/clients/zlocate/Imakefile
+++ b/clients/zlocate/Imakefile
@@ -8,14 +8,8 @@
 /**/#	$Header$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${COMERR_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB} ${DES_LINTLIB}
 SRCS = zlocate.c
 OBJS = zlocate.o
 
-SRCDIR= ${SRCTOP}/clients/zlocate
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zlocate,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zlocate,)
+install_man(zlocate.1,zlocate.1)
diff --git a/clients/zmailnotify/Imakefile b/clients/zmailnotify/Imakefile
index 32f9692..c9f9758 100644
--- a/clients/zmailnotify/Imakefile
+++ b/clients/zmailnotify/Imakefile
@@ -8,22 +8,18 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB} ${HES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB} ${DES_LINTLIB}
-DEFINES= -DKPOP
+#if defined(KERBEROS) && defined(HESIOD)
+XDEFS= -DKPOP
 
 SRCS = zmailnotify.c
 OBJS = zmailnotify.o
 
-SRCDIR= ${SRCTOP}/clients/zmailnotify
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zmailnotify,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zmailnotify,$(LIB_HES))
+install_man(zmailnotify.1,zmailnotify.1)
 
 #ifdef ATHENA_COMPAT
 install::
 	$(RM) $(DESTDIR)/usr/athena/zmailnotify
 	ln -s $(CLIENTDIR)/zmailnotify $(DESTDIR)/usr/athena/zmailnofity
 #endif
+#endif
diff --git a/clients/znol/Imakefile b/clients/znol/Imakefile
index 5c16c6d..40e3833 100644
--- a/clients/znol/Imakefile
+++ b/clients/znol/Imakefile
@@ -8,14 +8,8 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = znol.c
 OBJS = znol.o
 
-SRCDIR= ${SRCTOP}/clients/znol
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(znol,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(znol,)
+install_man(znol.1,znol.1)
diff --git a/clients/zpopnotify/Imakefile b/clients/zpopnotify/Imakefile
index 91b6851..497b984 100644
--- a/clients/zpopnotify/Imakefile
+++ b/clients/zpopnotify/Imakefile
@@ -1,21 +1,13 @@
-/**/#	Copyright 1988 Massachusetts Institute of Technology.
+/**/#	Copyright 1988, 1993 Massachusetts Institute of Technology.
 /**/#
 /**/#	For copying and distribution information, see the file
 /**/#	"mit-copyright.h". 
 /**/#
-/**/#	$Source$
-/**/#	$Author$
 /**/#	$Id$
-/**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zpopnotify.c
 OBJS = zpopnotify.o
 
-SRCDIR= ${SRCTOP}/clients/zpopnotify
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zpopnotify,${OBJS},,${LIBS},${USRETCDIR})
+SimpleProgram(zpopnotify,$(OBJS),$(ZLIBS),$(ATHETCDIR))
+install_man(zpopnotify.8,zpopnotify.8)
+create_depend($(SRCS))
diff --git a/clients/zshutdown_notify/Imakefile b/clients/zshutdown_notify/Imakefile
index fc81079..1279517 100644
--- a/clients/zshutdown_notify/Imakefile
+++ b/clients/zshutdown_notify/Imakefile
@@ -8,14 +8,9 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zshutdown_notify.c
 OBJS = zshutdown_notify.o
 
-SRCDIR= ${SRCTOP}/clients/zshutdown_notify
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zshutdown_notify,${OBJS},,${LIBS},${ETCATHDIR})
+SimpleProgram(zshutdown_notify,$(OBJS),$(ZLIBS),$(ATHETCDIR))
+install_man(zshutdown_notify.8,zshutdown_notify.8)
+create_depend($(SRCS))
diff --git a/clients/zstat/Imakefile b/clients/zstat/Imakefile
index 8da884a..9ffd2ac 100644
--- a/clients/zstat/Imakefile
+++ b/clients/zstat/Imakefile
@@ -7,20 +7,9 @@
 /**/#	$Author$
 /**/#	$Id$
 /**/#
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
+
 SRCS = zstat.c
 OBJS = zstat.o
-HDRS = zserver.h
-
-SRCDIR= ${SRCTOP}/clients/zstat
-CODE= ${SRCS} ${HDRS} Imakefile
-
-/* dummy rule so 'make' means 'make all' */
-all::
-
-depend::
-	(cd ../../server; make src)
-normal_obj_rule()
 
-program(zstat,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zstat,)
+install_man(zstat.8,zstat.8)
diff --git a/clients/zwrite/Imakefile b/clients/zwrite/Imakefile
index b522afb..b07be96 100644
--- a/clients/zwrite/Imakefile
+++ b/clients/zwrite/Imakefile
@@ -8,14 +8,8 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zwrite.c
 OBJS = zwrite.o
 
-SRCDIR= ${SRCTOP}/clients/zwrite
-CODE= ${SRCS} Imakefile
-
-normal_obj_rule()
-
-program(zwrite,${OBJS},,${LIBS},${CLIENTDIR})
+zprogram(zwrite,)
+install_man(zwrite.1,zwrite.1)