New Athena imake rules

3 files changed, 20 insertions, 67 deletions

diff --git a/zwgc/Dictionary/Imakefile b/zwgc/Dictionary/Imakefile
index c5bc4ad..c8b77b7 100644
--- a/zwgc/Dictionary/Imakefile
+++ b/zwgc/Dictionary/Imakefile
@@ -1,54 +1,34 @@
-/**/#	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$
-/**/#
-
-LIBS= $(ZEPHYR_LIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
-LINTLIBS=$(ZEPHYR_LINTLIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
+/**/#	$Id$
 
 OBJS = string_dictionary_aux.o int_dictionary.o string_dictionary.o
-
-REALSRCS = dictionary.c string_dictionary_aux.c
-REALHDRS = dictionary.h string_dictionary_aux.h
 SRCS = string_dictionary_aux.c int_dictionary.c string_dictionary.c
-HDRS = string_dictionary_aux.h int_dictionary.h string_dictionary.h
 
-LINCLUDES = -I../Memory -I../String
+XDEFS = -I../String -I../Memory
 
 GENERATORS= generate_dictionary_instance
 
-SRCDIR= ${SRCTOP}/zwgc/Dictionary
-BUILDDIR= ${BUILDTOP}/zwgc/Dictionary
-CODE= ${GENERATORS} ${REALSRCS} ${REALHDRS} Imakefile
-
-normal_obj_rule()
-
 all:: string_dictionary.h dictionary_spec $(OBJS)
+depend:: $(GENERATORS) $(SRCS)
 
-depend:: ${GENERATORS} ${SRCS}
-
-#
-# /* Automatically generate a spec file from the template include file: */
-#
+/**/# Automatically generate a spec file from the template include file:
 dictionary_spec: dictionary.h
 	cat dictionary.h | grep "^.\*" | grep -v "^ \*/" | sed 's/.\*//' > dictionary_spec
 
-#
-# Generate a int dictionary instance:
-#
+/**/# Generate a int dictionary instance:
 int_dictionary.c int_dictionary.h: dictionary.c dictionary.h
-	./generate_dictionary_instance ${BUILDDIR} int
-#
-# Generate a string dictionary instance:
-#
+	./generate_dictionary_instance . int
+
+/**/# Generate a string dictionary instance:
 string_dictionary.c string_dictionary.h: dictionary.c dictionary.h
-	./generate_dictionary_instance ${BUILDDIR} string new_string.h
+	./generate_dictionary_instance . string new_string.h
 
 clean::
 	$(RM) $(OBJS) dictionary_spec int_dictionary.c string_dictionary.c \
 		int_dictionary.h string_dictionary.h
+
+string_dictionary_aux.o: string_dictionary.h
diff --git a/zwgc/Memory/Imakefile b/zwgc/Memory/Imakefile
index b8b9a74..5d01802 100644
--- a/zwgc/Memory/Imakefile
+++ b/zwgc/Memory/Imakefile
@@ -1,30 +1,16 @@
-/**/#	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$
-/**/#
-
-LIBS= $(ZEPHYR_LIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
-LINTLIBS=$(ZEPHYR_LINTLIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
+/**/#	$Id$
 
 OBJS = new_memory.o
 SRCS = new_memory.c
-HDRS = new_memory.h
-
-SRCDIR= ${SRCTOP}/zwgc/Memory
-CODE= ${SRCS} ${HDRS} Imakefile
-
-normal_obj_rule()
 
 all:: memory_spec $(OBJS)
 
-#
-# /* Automatically generate a spec file from the template include file: */
-#
+/**/# Automatically generate a spec file from the template include file:
 memory_spec: new_memory.h
 	cat new_memory.h | grep "^.\*" | grep -v "^ \*/" | sed 's/.\*//' > memory_spec
 
diff --git a/zwgc/String/Imakefile b/zwgc/String/Imakefile
index f080d8e..e47f681 100644
--- a/zwgc/String/Imakefile
+++ b/zwgc/String/Imakefile
@@ -1,35 +1,22 @@
-/**/#	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$
-/**/#
+/**/#	$Id$
 
-LIBS= $(ZEPHYR_LIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
-LINTLIBS=$(ZEPHYR_LINTLIB) $(COMERR_LIB) $(KRB_LIB) $(DES_LIB)
 
 OBJS = new_string.o
 SRCS = new_string.c
-HDRS = new_string.h
-
-SRCDIR= ${SRCTOP}/zwgc/String
-CODE= ${SRCS} ${HDRS} Imakefile
-
-LINCLUDES= -I../Memory
 
-normal_obj_rule()
+XDEFS= -I../Memory
 
 all:: string_spec $(OBJS)
 
-#
-# /* Automatically generate a spec file from the template include file: */
-#
+/**/# Automatically generate a spec file from the template include file:
 string_spec: new_string.h
 	cat new_string.h | grep "^.\*" | grep -v "^ \*/" | sed 's/.\*//' > string_spec
 
 clean::
-	$(RM) $(OBJS) memory_spec
+	$(RM) $(OBJS) string_spec