summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Imakefile77
-rw-r--r--h/Imakefile16
-rw-r--r--server/Imakefile43
3 files changed, 21 insertions, 115 deletions
diff --git a/Imakefile b/Imakefile
index 612db6b..9f2b015 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,74 +1,15 @@
-/**/# 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$
-/**/# $Header$
+/**/# "mit-copyright.h"
/**/#
-#define have_subdirs
-#define no_curdir_lint
-
-NEWTOP=.
-CODE=Imakefile
-#ifdef LOCAL_LIBS
-LOC_SUBDIRS = et ss
-#endif /*LOCAL_LIBS*/
-#ifdef BuildServer
-SERVER=server
-#endif
-SUBDIRS= ${LOC_SUBDIRS} include lib libdyn clients ${SERVER} zhm zwgc man #ozwgc
-/* Need to make sure `all' is the first target */
-all::
-/**/# we need to remove these here; it is not appropriate to remove them
-/**/# from lib/Makefile since someone may type 'make clean' there and nuke
-/**/# them by accident.
-
-clean::
- rm -f libs/libzephyr.a libs/llib-lzephyr.ln
-
-#ifdef PROFILED_LIBS
-clean::
- rm -f libs/libzephyr_p.a
-#endif
-
-#ifdef HaveUCode
-clean::
- rm -f libs/libzephyr.b
-#endif
+/**/# $Id$
-#ifdef OTHER_IMAKE
-world:
- make ${MFLAGS} Makefile
- make ${MFLAGS} Makefiles
- make ${MFLAGS} depend
- make ${MFLAGS} all
-#else
-world:
- (cd imake; make ${MFLAGS} clean; make ${MFLAGS} imake)
- make ${MFLAGS} Makefile
- make ${MFLAGS} Makefiles
- make ${MFLAGS} depend
- make ${MFLAGS} all
+#define Project
+#ifndef ProjectRules
+#define ProjectRules "config/zephyr.rules"
+#include ProjectRules
#endif
-#ifdef LOCAL_makedepend
-/**/# We need to make makedepend before we make depend
-depend::
- (cd makedepend; make ${MFLAGS} all)
-
-clean::
- (cd makedepend; make ${MFLAGS} clean)
-
-#endif /* LOCAL_makedepend */
-
-#ifdef LOCAL_LIBS
-/**/# We need to make ss.h so that make depend can find it.
-/**/# and to make ss.h, we need et/compile_et
-depend::
- (cd et; make ${MFLAGS} depend)
- (cd et; make ${MFLAGS} all)
- (cd ss; make ${MFLAGS} depend)
-#endif /* LOCAL_LIBS */
+#define ISUBDIRS util include lib libdyn clients server zhm zwgc /* man */
+create_dir($(ZLIBDIR))
diff --git a/h/Imakefile b/h/Imakefile
index 9eedaf1..b2260ad 100644
--- a/h/Imakefile
+++ b/h/Imakefile
@@ -7,19 +7,5 @@
/**/# $Author$
/**/# $Zephyr: Imakefile,v 1.1 89/03/23 17:21:13 jtkohl Exp $
/**/#
-#define have_subdirs
-#define no_curdir_lint
-SRCDIR= ${SRCTOP}/include
-CODE= Imakefile
-
-SUBDIRS= zephyr
-
-#ifdef LOCAL_LIBS
-all:: com_err.h ss
-depend:: com_err.h ss
-com_err.h:
- ln -s ../et/lib/com_err.h .
-ss:
- ln -s ../ss/lib ss
-#endif
+#define ISUBDIRS zephyr
diff --git a/server/Imakefile b/server/Imakefile
index 4ff6696..e37bca6 100644
--- a/server/Imakefile
+++ b/server/Imakefile
@@ -8,25 +8,15 @@
/**/# $Header$
/**/#
-#if defined(DO_SYSLOG) && defined(SYSLOG_COMPAT42)
+#if defined(SYSLOG_COMPAT42)
SYSLOG_LIB= ../clients/syslogd/syslog.o
SYSLOG_DEF= -I../clients/syslogd
#else
SYSLOG_LIB=
SYSLOG_DEF=
#endif
-LIBS= ${SYSLOG_LIB} ${ZEPHYR_LIB} ${HES_LIB} ${KRB_LIB} \
- ${DES_LIB} ${COMERR_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${HES_LINTLIB} \
- ${KRB_LINTLIB} ${DES_LINTLIB}
-HDRS= zserver.h \
- zsrv_conf.h \
- timer.h \
- zstring.h \
- unix.h \
- zalloc.h \
- access.h
+XDEFS = $(SYSLOG_DEF) -DCONCURRENT
SRCS= access.c \
acl_files.c \
@@ -65,31 +55,20 @@ OBJS= access.o \
zsrv_err.o \
zstring.o
-OTHERSRCS= zsrv_err.et
-CONFIG_FILES= default.subscriptions
-SRCDIR= ${SRCTOP}/server
-CODE= ${SRCS} ${HDRS} ${OTHERSRCS} ${CONFIG_FILES} Imakefile
+error_table(zsrv_err)
+SimpleProgram(zephyrd,$(OBJS) version.o,$(ZLIBS) $(LIB_HES),$(ATHETCDIR))
+install_man(zephyrd.8,zephyrd.8)
+install_file(default.subscriptions,$(ZLIBDIR))
-DEFINES= $(SYSLOG_DEF) -DCONCURRENT
-normal_obj_rule()
-
-program(zephyrd,${OBJS} version.o,,${LIBS},${USRETCDIR})
-
-error_table_noprof(zsrv_err)
-
-src:: zsrv_err.h
+create_dir($(ZACLDIR))
+install::
+ $(RM) $(DESTDIR)$(ZACLDIR)/?*.acl
+ $(CP) acldir/?* $(DESTDIR)$(ZACLDIR)
depend:: zsrv_err.h version.h
+$(OBJS): zsrv_err.h
-install::
- -mkdir ${DESTDIR}${ACLDIR}
- -rm -f ${DESTDIR}${ACLDIR}/?*.acl
- cp acldir/?* ${DESTDIR}${ACLDIR}
- ${INSTALLFILE} default.subscriptions ${DESTDIR}${ACLDIR}/default.subscriptions
-
-zephyrd: version.o
version.o: version.h
-
version.h: $(SRCS)
$(RM) version.h
sh new_vers.sh