From 5d3adfd49fee71846fcb0575b150a4b631233cd7 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Tue, 5 Nov 1996 23:46:02 +0000
Subject: [PATCH] 	* configure.in: Revert removal of CopySrcHeader, etc.,
 for now

	* Makefile.in (OBJS): Remove dependency of $(OBJS) on shared, also
	remove dependency of $(HDRS) on $(HDRDIR).  Both of these to avoid
	unecessary copying.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9301 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/rpc/ChangeLog    |  8 ++++++++
 src/lib/rpc/Makefile.in  | 35 ++---------------------------------
 src/lib/rpc/configure.in | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index 47f9aa99e..00975d930 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov  5 18:43:46 1996  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Revert removal of CopySrcHeader, etc., for now.
+
+	* Makefile.in (OBJS): Remove dependency of $(OBJS) on shared, also
+	remove dependency of $(HDRS) on $(HDRDIR).  Both of these to avoid
+	unecessary copying.
+
 Wed Oct 30 13:18:34 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* xdr_stdio.c: Remove the #ifndef mc68000 cruft.  I'm not sure
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 29db6d217..d52fca6d1 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -114,39 +114,7 @@ HDRS=	$(HDRDIR)/auth.h \
 	$(HDRDIR)/types.h \
 	$(HDRDIR)/xdr.h
 
-$(OBJS): $(HDRS) shared
-
-$(HDRDIR):
-	mkdir $@
-
-$(HDRDIR)/auth.h: $(HDRDIR) $(srcdir)/auth.h
-	$(CP) $(srcdir)/auth.h $@
-$(HDRDIR)/auth_gssapi.h: $(HDRDIR) $(srcdir)/auth_gssapi.h
-	$(CP) $(srcdir)/auth_gssapi.h $@
-$(HDRDIR)/auth_unix.h: $(HDRDIR) $(srcdir)/auth_unix.h
-	$(CP) $(srcdir)/auth_unix.h $@
-$(HDRDIR)/clnt.h: $(HDRDIR) $(srcdir)/clnt.h
-	$(CP) $(srcdir)/clnt.h $@
-$(HDRDIR)/netdb.h: $(HDRDIR) $(srcdir)/netdb.h
-	$(CP) $(srcdir)/netdb.h $@
-$(HDRDIR)/pmap_clnt.h: $(HDRDIR) $(srcdir)/pmap_clnt.h
-	$(CP) $(srcdir)/pmap_clnt.h $@
-$(HDRDIR)/pmap_prot.h: $(HDRDIR) $(srcdir)/pmap_prot.h
-	$(CP) $(srcdir)/pmap_prot.h $@
-$(HDRDIR)/pmap_rmt.h: $(HDRDIR) $(srcdir)/pmap_rmt.h
-	$(CP) $(srcdir)/pmap_rmt.h $@
-$(HDRDIR)/rpc.h: $(HDRDIR) $(srcdir)/rpc.h
-	$(CP) $(srcdir)/rpc.h $@
-$(HDRDIR)/rpc_msg.h: $(HDRDIR) $(srcdir)/rpc_msg.h
-	$(CP) $(srcdir)/rpc_msg.h $@
-$(HDRDIR)/svc.h: $(HDRDIR) $(srcdir)/svc.h
-	$(CP) $(srcdir)/svc.h $@
-$(HDRDIR)/svc_auth.h: $(HDRDIR) $(srcdir)/svc_auth.h
-	$(CP) $(srcdir)/svc_auth.h $@
-$(HDRDIR)/xdr.h: $(HDRDIR) $(srcdir)/xdr.h
-	$(CP) $(srcdir)/xdr.h $@
-$(HDRDIR)/types.h: $(HDRDIR) types.h
-	$(CP) types.h $@
+$(OBJS): $(HDRS)
 
 LIB_SUBDIRS= .
 LIBDONE= DONE
@@ -166,6 +134,7 @@ SHLIB_LIBS=-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -ldyn
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
+all-unix:: shared
 all-unix:: $(OBJS)
 all-mac:: $(OBJS)
 all-windows:: $(OBJS)
diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in
index 9458e2d3a..c2217044f 100644
--- a/src/lib/rpc/configure.in
+++ b/src/lib/rpc/configure.in
@@ -80,6 +80,21 @@ AC_SUBST(CRYPTO_SH_VERS)
 COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
 AC_SUBST(COMERR_SH_VERS)
 
+CopySrcHeader(auth.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(auth_gssapi.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(auth_unix.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(clnt.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(netdb.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(pmap_clnt.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(pmap_prot.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(pmap_rmt.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(rpc.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(rpc_msg.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(svc.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(svc_auth.h,[$](BUILDTOP)/include/rpc)
+CopyHeader(types.h,[$](BUILDTOP)/include/rpc)
+CopySrcHeader(xdr.h,[$](BUILDTOP)/include/rpc)
+
 dnl
 dnl This is gross but necessary because of the way we build shared libs
 dnl
-- 
2.26.2