about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--include/des.h1
-rw-r--r--sunrpc/Makefile4
-rw-r--r--sunrpc/rpc/rpc_des.h (renamed from sunrpc/des.h)0
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0064757d7f..1bacb0fa89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-03-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sunrpc/Makefile (headers): Add rpc/rpc_des.h.
+	(distribute): Remove des.h.
+	* include/des.h: New file.
+	* sunrpc/des.h: Moved to ...
+	* sunrpc/rpc/rpc_des.h: ...here.
+
 1998-03-22  NIIBE Yutaka  <gniibe@mri.co.jp>
 
 	* inet/netinet/in.h (IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_LOOPBACK):
diff --git a/include/des.h b/include/des.h
new file mode 100644
index 0000000000..a519b6f681
--- /dev/null
+++ b/include/des.h
@@ -0,0 +1 @@
+#include <sunrpc/rpc/rpc_des.h>
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 345a23a3dd..c0c9288020 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -51,7 +51,7 @@ rpcsvc = bootparam.x nlm_prot.x rstat.x \
 headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \
 			   pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h \
 			   svc_auth.h types.h xdr.h auth_des.h \
-			   des_crypt.h key_prot.h) \
+			   des_crypt.h key_prot.h rpc_des.h) \
 	  $(rpcsvc:%=rpcsvc/%)
 install-others = $(inst_sysconfdir)/rpc
 generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) \
@@ -76,7 +76,7 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
 	      rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \
 	      rpc_tblout.o rpc_sample.o
 # These headers are part of rpcgen.
-distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h des.h \
+distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h \
 	      $(rpcgen-objs:.o=.c) etc.rpc
 extra-objs = $(rpcgen-objs)
 
diff --git a/sunrpc/des.h b/sunrpc/rpc/rpc_des.h
index 68bd7c47ab..68bd7c47ab 100644
--- a/sunrpc/des.h
+++ b/sunrpc/rpc/rpc_des.h