From 15dae9264ffcaa9393a0cead4595602b589ce74b Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 1 Aug 2006 21:19:53 +0000 Subject: [PATCH] death-to-des-stub-20060801 Remove des_stub; we don't care any more. --- Makefile.in | 1 - configure.in | 1 - src/NTMakefile | 19 +++++----------- src/NTObjdir | 1 - src/SOURCE-MAP | 1 - src/des_stub/.cvsignore | 1 - src/des_stub/Makefile.in | 16 -------------- src/des_stub/NTMakefile | 57 ------------------------------------------------ 8 files changed, 6 insertions(+), 91 deletions(-) delete mode 100644 src/des_stub/.cvsignore delete mode 100644 src/des_stub/Makefile.in delete mode 100644 src/des_stub/NTMakefile diff --git a/Makefile.in b/Makefile.in index 0914a5d..30f7435 100644 --- a/Makefile.in +++ b/Makefile.in @@ -735,7 +735,6 @@ distclean: clean src/dauth/Makefile \ src/des/test/Makefile \ src/des/Makefile \ - src/des_stub/Makefile \ src/dir/test/Makefile \ src/dir/Makefile \ src/export/Makefile \ diff --git a/configure.in b/configure.in index 432284b..5761960 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,6 @@ src/config/Makefile.version-NOCML \ src/dauth/Makefile \ src/des/Makefile \ src/des/test/Makefile \ -src/des_stub/Makefile \ src/dir/Makefile \ src/dir/test/Makefile \ src/export/Makefile \ diff --git a/src/NTMakefile b/src/NTMakefile index 4896cfc..42a6306 100644 --- a/src/NTMakefile +++ b/src/NTMakefile @@ -118,17 +118,10 @@ rxgen: lwp des: rxgen echo ***** $@ -! IF (EXIST($(SRC)\des\NTMakefile)) - $(DOCD) $(SRC)\des - $(CD) $(SRC)\des - $(NTMAKE) - $(CD) ..\.. -! ELSE - $(DOCD) $(SRC)\des_stub - $(CD) $(SRC)\des_stub - $(NTMAKE) - $(CD) ..\.. -! ENDIF + $(DOCD) $(SRC)\des + $(CD) $(SRC)\des + $(NTMAKE) + $(CD) ..\.. rx: des echo ***** $@ @@ -610,8 +603,8 @@ mkdir: -mkdir $(DESTDIR) -mkdir $(AFS_OBJDIR)\checked -mkdir $(AFS_OBJDIR)\free - -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\ - -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\ + -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\ + -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\ -mkdir $(DESTDIR)\checked -mkdir $(DESTDIR)\free -mkdir $(DESTDIR)\checked\bin diff --git a/src/NTObjdir b/src/NTObjdir index b0e7366..238c968 100755 --- a/src/NTObjdir +++ b/src/NTObjdir @@ -164,7 +164,6 @@ dirs="\ comerr \ comerr/test \ des \ - des_stub \ cmd \ rxgen \ rxstat \ diff --git a/src/SOURCE-MAP b/src/SOURCE-MAP index bbd5b3f..8e6dfa8 100644 --- a/src/SOURCE-MAP +++ b/src/SOURCE-MAP @@ -27,7 +27,6 @@ config - build system OS-specific configuration dauth - dlog - get a krb ticket for use with the AFS/DFS translator dpass - also part of the AFS/DFS migration kit des - des library -des_stub - remnant of export restrictions on encryption code. dir - afs directory handling library (client and server, internal format) export - from the README: EXPORT is an aix3.1 kernel extension whose sole purpose in diff --git a/src/des_stub/.cvsignore b/src/des_stub/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/des_stub/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/des_stub/Makefile.in b/src/des_stub/Makefile.in deleted file mode 100644 index c9e8232..0000000 --- a/src/des_stub/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -srcdir=@srcdir@ -include @TOP_OBJDIR@/src/config/Makefile.config - -# -# Makefile is a no op, we don't do des stubs any more -# -all: - -clean: diff --git a/src/des_stub/NTMakefile b/src/des_stub/NTMakefile deleted file mode 100644 index 2eb45fe..0000000 --- a/src/des_stub/NTMakefile +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -RELDIR=des_stub -!INCLUDE ..\config\NTMakefile.$(SYS_NAME) - -# Relative location of DESLIB link depends on how we got to current directory - -!IF (EXIST(..\..\DESLIB)) -DESPAR = ..\..\DESLIB\dest -!ELSE IF (EXIST(..\..\..\DESLIB)) -DESPAR = ..\..\..\DESLIB\dest -!ELSE -!ERROR Must create DESLIB link in the same directory as PARENT link. -!ENDIF - -DESINC = $(DESPAR)\include - - -INCFILEDIR = $(DESTDIR)\include -INCFILES =\ - $(INCFILEDIR)\des.h \ - $(INCFILEDIR)\des_conf.h \ - $(INCFILEDIR)\des_odd.h \ - $(INCFILEDIR)\mit-cpyright.h \ - $(INCFILEDIR)\crypt.h - -$(INCFILEDIR)\des.h: $(DESINC)\des.h - $(COPY) $? $@ - -$(INCFILEDIR)\des_conf.h: $(DESINC)\des_conf.h - $(COPY) $? $@ - -$(INCFILEDIR)\des_odd.h: $(DESINC)\des_odd.h - $(COPY) $? $@ - -$(INCFILEDIR)\mit-cpyright.h: $(DESINC)\mit-cpyright.h - $(COPY) $? $@ - -$(INCFILEDIR)\crypt.h: $(DESINC)\crypt.h - $(COPY) $? $@ - - -LIBFILES =\ - $(DESTDIR)\lib\afsdes.lib - -$(DESTDIR)\lib\afsdes.lib: $(DESPAR)\lib\afsdes.lib - $(COPY) $? $@ - -install: $(LIBFILES) $(INCFILES) - -clean:: - $(DEL) $(DESPAR)\lib\afsdes.lib \ No newline at end of file -- 1.9.4