From: Ezra Peisach <epeisach@mit.edu>
Date: Thu, 6 Feb 1997 16:15:06 +0000 (+0000)
Subject: 	* configure.in: Remove the CopyHeader and CopySrcHeader rules as
X-Git-Tag: krb5-1.1-beta1~1370
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc2c4bb532a51ba72300129c5f560f19e6b16a15;p=krb5.git

	* configure.in: Remove the CopyHeader and CopySrcHeader rules as
		they are handled in Makefile.in

	* Makefile.in: Create include/gssapi on unix. Make clean removes
		built gssapi.h

These were broken on the unix side.
Make complained about too many rules for building the
	../../../include/gssapi/.... files - because they were defined
	twice.

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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 6d64903d0..6dc165367 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,11 @@
+Thu Feb  6 11:11:17 1997  Ezra Peisach  (epeisach@mit.edu)
+
+	* configure.in: Remove the CopyHeader and CopySrcHeader rules as
+		they are handled in Makefile.in
+
+	* Makefile.in: Create include/gssapi on unix. Make clean removes
+		built gssapi.h
+
 Wed Feb  5 23:28:47 1997  Richard Basch  <basch@lehman.com>
 
 	* gssapi.hin: Make sure KRB5_EXPORTVAR is defined.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 4b652734e..4e493d726 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -44,7 +44,7 @@ gssapi.h: gssapi.hin
 	grep SIZEOF $(BUILDTOP)/include/krb5/autoconf.h >> $@
 	grep 'HAVE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h >> $@
 	grep 'USE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h >> $@
-	echo "/* End of gssapi.h prologue. */"
+	echo "/* End of gssapi.h prologue. */" >> $@
 	cat $(srcdir)/gssapi.hin >> $@
 
 #if HasHashLibrary
@@ -94,7 +94,7 @@ EXPORTED_BUILT_HEADERS= gssapi.h
 
 $(OBJS): $(EXPORTED_HEADERS) $(ETHDRS)
 
-all-unix:: shared $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
+all-unix:: shared includes-unix $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
 all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
 all-windows:: win-include $(HDRS) $(OBJFILE)
 
@@ -109,7 +109,7 @@ win-include::
 unixmac: $(SRCS) $(ETHDRS)
 
 clean-unix::
-	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
+	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/* $(EXPORTED_BUILT_HEADERS) 
 
 clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
@@ -118,6 +118,9 @@ clean-windows::
 	$(RM) $(HDRS) $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
+includes-unix::
+	@if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi
+
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 install::
 	@set -x; for f in $(EXPORTED_HEADERS) ; \
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index b27f461d9..f6953b907 100644
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -9,6 +9,6 @@ AC_SIZE_T
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
-CopyHeader(gssapi.h,[$(EHDRDIR)])
-CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
+dnl CopyHeader(gssapi.h,[$(EHDRDIR)])
+dnl CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
 V5_AC_OUTPUT_MAKEFILE