* Makefile.in (BUILDTOP2, etc): Make it possible

to build the error tables on Unix before a Mac build.
(all-mac):  Don't build $(HDRS) on Mac.
(unixmac):  Build `includes'.
(clean-mac):  Add.
(includes, clean, .SUFFIXES, .et.h, .et.c):  Add, to make it
possible to run `make -f Makefile.in unixmac' successfully.
* configure.in (ASN1_{HDRS,OBJS,SRCS, BOGUS):  Remove, unused.
(CopyHeader rules):  Remove, they're now in Makefile.in.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5297 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 45 insertions, 13 deletions

diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index d2fe3ba37..52b222c18 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar 28 18:29:44 1995  John Gilmore  (gnu at toad.com)
+
+	* Makefile.in (BUILDTOP2, etc):  Make it possible
+	to build the error tables on Unix before a Mac build.
+	(all-mac):  Don't build $(HDRS) on Mac.
+	(unixmac):  Build `includes'.
+	(clean-mac):  Add.
+	(includes, clean, .SUFFIXES, .et.h, .et.c):  Add, to make it
+	possible to run `make -f Makefile.in unixmac' successfully.
+	* configure.in (ASN1_{HDRS,OBJS,SRCS, BOGUS):  Remove, unused.
+	(CopyHeader rules):  Remove, they're now in Makefile.in.
+
 Fri Mar 24 14:25:15 1995    <tytso@rsx-11.mit.edu>
 
 	* Makefile.in (install): Add install rule for the error table
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 526556dd0..33497d036 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -4,7 +4,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSLIBNAME=..\krb5.lib
 ##DOS!include $(BUILDTOP)\config\windows.in
 
-EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
+EHDRDIR=$(BUILDTOP2)$(S)include$(S)krb5
+
+# The "unixmac" and "includes" rules need to run in Makefile.in,
+# without all the support glop like $(S) and $(BUILDTOP)...so, fake it.
+BUILDTOP2 = ../../..
+SRCTOP2 = $(BUILDTOP2)
+EHDRDIR2=$(BUILDTOP2)/include/krb5
 
 HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h
 OBJS= asn1_err.$(OBJEXT) kdb5_err.$(OBJEXT) krb5_err.$(OBJEXT) \
@@ -15,11 +21,11 @@ SRCS=$(ETSRCS) init_ets.c
 all:: all-$(WHAT)
 
 all-unix:: $(HDRS) includes $(OBJS)
-all-mac:: $(HDRS) $(OBJS)
+all-mac:: $(OBJS)
 
 all-windows:: $(OBJS)
 
-unixmac: $(HDRS) $(SRCS)
+unixmac: $(HDRS) includes $(SRCS)
 
 awk-windows:
 	$(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=asn1_err.h asn1_err.et
@@ -60,5 +66,28 @@ clean:: clean-$(WHAT)
 
 clean-unix::
 	$(RM) $(HDRS) $(ETSRCS)
-
+clean-mac:
+	$(RM) $(HDRS) $(ETSRCS)
 clean-windows::
+
+
+includes:: $(HDRS)
+	for x in $(HDRS); do \
+	if cmp $$x $(EHDRDIR2)/$$x >/dev/null 2>&1; then :; \
+	else \
+		(set -x; rm -f $(EHDRDIR2)/$$x;	cp $$x $(EHDRDIR2)/$$x) \
+	fi; done
+
+clean::
+	for x in $(HDRS); do \
+		rm -f $(EHDRDIR2)/$$x; \
+	done
+
+.SUFFIXES:  .h .c .et .ct
+
+.et.h:
+	awk -f $(SRCTOP2)/util/et/et_h.awk outfile=$*.h $<
+
+.et.c:
+	awk -f $(SRCTOP2)/util/et/et_c.awk outfile=$*.c $<
+
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index f5357759a..38dbe033c 100644
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -5,14 +5,5 @@ AC_SET_BUILDTOP
 ET_RULES
 SS_RULES
 KRB_INCLUDE
-AC_SUBST(ASN1_HDRS)
-AC_SUBST(ASN1_OBJS)
-AC_SUBST(ASN1_SRCS)
-AC_SUBST(BOGUS)
 SubdirLibraryRule([${OBJS}])
-CopyHeader(krb5_err.h,[$(EHDRDIR)])
-CopyHeader(kv5m_err.h,[$(EHDRDIR)])
-CopyHeader(kdb5_err.h,[$(EHDRDIR)])
-CopyHeader(adm_err.h,[$(EHDRDIR)])
-CopyHeader(asn1_err.h,[$(EHDRDIR)])
 V5_AC_OUTPUT_MAKEFILE