Moved some of the library list file build logic from the individual M…

…akefiles to config/win-post.in git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9964 dc483132-0cff-0310-8789-dd5450dbe970
aadamowski · Feb 23, 1997 · 7e1a77a · 7e1a77a
1 parent 6f50091
commit 7e1a77a
Show file tree

Hide file tree

Showing 46 changed files with 199 additions and 267 deletions.
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
@@ -45,13 +45,7 @@ SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
-# FIXME, need to build the library too...
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-liblinks
 install-unix:: install-libs
@@ -60,8 +54,6 @@ libcrypto.lib:
 	libdir crypto.lib
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-clean-windows::
-	$(RM) crypto.lib crypto.bak $(OBJFILE)
 
 check-unix::
 

diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 22 18:46:38 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Move list file construction to win-post.in
+
 Thu Jan 30 21:30:32 1997  Richard Basch  <basch@lehman.com>
 
 	* crc.c: Declare the functions to take const pointers, where possible.

diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
@@ -1,22 +1,15 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=crc32
-##DOSOBJFILE=..\crc32.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=crc32
+##DOS##OBJFILE=..\crc32.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS=crc.o
-
 OBJS=	crc.$(OBJEXT)
-
 SRCS=	$(srcdir)/crc.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -34,5 +27,3 @@ clean::
 	$(RM) crctest$(EXEEXT) crctest.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:50:35 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Fri Feb  7 07:12:52 1997  Richard Basch  <basch@lehman.com>
 
 	* Makefile.in (all-unix, all-mac): Create shared directory

diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
@@ -1,9 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=des
-##DOSOBJFILE=..\des.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=des
+##DOS##OBJFILE=..\des.lst
 ##WIN16##LIBNAME=..\crypto.lib
+
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -82,12 +83,7 @@ SRCS=	$(srcdir)/afsstring2key.c \
 	$(srcdir)/u_nfold.c \
 	$(srcdir)/u_rn_key.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -122,7 +118,4 @@ clean::
 	$(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) \
 	t_verify.$(OBJEXT) t_random.$(OBJEXT) t_random$(EXEEXT)
 
-clean-windows::
-	$(RM) $(OBJFILE)
-
 clean-unix:: clean-libobjs
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:53:00 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Thu Feb  6 12:46:49 1997  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (t_cksum): Link with libkrb5.a.

diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
@@ -1,25 +1,18 @@
 # -I$(srcdir) is needed to pull in $(srcdir)/rsa-md4.h for ./t_mddriver.c.
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)"
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=md4
-##DOSOBJFILE=..\md4.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=md4
+##DOS##OBJFILE=..\md4.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
 STLIBOBJS=md4.o md4glue.o md4crypto.o
-
 OBJS=	md4.$(OBJEXT) md4glue.$(OBJEXT) md4crypto.$(OBJEXT)
-
 SRCS=	$(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -58,5 +51,3 @@ clean::
 	$(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT) t_cksum.c
 
 clean-unix:: clean-libobjs
-clean-windows::
-	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:54:09 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Thu Feb  6 12:48:41 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (t_cksum): Link with libkrb5.a as well.

diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
@@ -1,24 +1,18 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=md5
-##DOSOBJFILE=..\md5.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=md5
+##DOS##OBJFILE=..\md5.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 RUN_SETUP = @KRB5_RUN_ENV@
 
 STLIBOBJS=md5.o md5glue.o md5crypto.o
 
 OBJS=	md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT)
-
 SRCS=	$(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs
 
@@ -43,5 +37,3 @@ clean::
 	$(RM) t_cksum$(EXEEXT) t_cksum.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:54:53 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Mon Feb 17 17:24:41 1997  Richard Basch  <basch@lehman.com>
 
 	* c_ustime.c: Fixed microsecond adjustment code (win32)

diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=os
-##DOSOBJFILE=..\os.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=os
+##DOS##OBJFILE=..\os.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS = rnd_confoun.o c_localaddr.o c_ustime.o @LIBOBJS@
@@ -12,12 +12,7 @@ OBJS= $(COBJS) $(LIBOBJS)
 
 SRCS=	rnd_confoun.c c_localaddr.c c_ustime.c
 
-all-windows:: $(OBJFILE)
-
-##DOS$(OBJFILE): $(COBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(COBJS)
 
 all-unix:: all-libobjs
 
@@ -29,6 +24,3 @@ memmove.o: memmove.c
 clean-unix:: clean-libobjs
 clean:: 
 	$(RM) memmove.c
-
-clean-windows::
-	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:52:09 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Thu Jan 30 21:31:39 1997  Richard Basch  <basch@lehman.com>
 
 	* sha_crypto.c sha_glue.c:

diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in
@@ -1,8 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYDIR=sha
-##DOSOBJFILE=..\sha.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=sha
+##DOS##OBJFILE=..\sha.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 STLIBOBJS=shs.o hmac_sha.o sha_crypto.o sha_glue.o
@@ -18,12 +18,8 @@ SRCS=	$(srcdir)/shs.c		\
 	$(srcdir)/sha_glue.c
 
 
-all-windows:: $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 
 all-unix:: all-libobjs
 
@@ -43,5 +39,3 @@ clean::
 	$(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT)
 
 clean-unix:: clean-libobjs
-clean-windows::
-	$(RM) $(OBJFILE)
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:55:52 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Sat Feb 22 01:07:34 1997  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* read_passwd.c: Don't base definitions on unix being defined.

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
@@ -1,10 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
-##DOSBUILDTOP = ..\..
-##DOSLIBNAME=des425.lib
-##DOSOBJFILE=des425.lst
-##DOSOBJFILEDEP=des425.lst
-##DOSOBJFILELIST=@des425.lst
+##DOS##BUILDTOP = ..\..
+##DOS##LIBNAME=des425.lib
+##DOS##OBJFILE=des425.lst
+##DOS##OBJFILEDEP=des425.lst
+##DOS##OBJFILELIST=@des425.lst
 
 RUN_SETUP=@KRB5_RUN_ENV@
 
@@ -76,12 +76,8 @@ DEPKLIB= $(TOPLIBD)/libcrypto.a
 
 all-unix:: all-liblinks
 all-mac:: $(OBJS)
-all-windows:: $(OBJFILE)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
 
 shared:
 	mkdir shared
@@ -100,9 +96,6 @@ clean::
 	$(RM) verify$(EXEEXT) verify.$(OBJEXT)
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-clean-mac::
-clean-windows::
-	$(RM) des425.lib des425.bak $(OBJFILE)
 
 libdes425.$(STEXT): $(OBJS)
 	$(RM) $@

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:57:56 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Sun Feb  9 11:41:08 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Fix includes generation for unix after

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
@@ -1,12 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
-##DOSBUILDTOP = ..\..\..
-##DOSMYNAME=generic
-##DOSOBJFILE=..\generic.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR=generic
+##DOS##OBJFILE=..\generic.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
-all-windows:: $(OBJS)
-
 ETSRCS= gssapi_err_generic.c
 ETOBJS= gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
@@ -103,12 +101,10 @@ all-unix:: includes-unix
 all-unix:: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS)
 all-unix:: all-libobjs
 
-all-windows:: win-include $(HDRS) $(OBJFILE)
 
-##DOS$(OBJFILE): $(OBJS)
-##DOS	$(RM) $(OBJFILE)
-##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
+##DOS##LIBOBJS = $(OBJS)
+
+all-windows:: win-include $(HDRS)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
@@ -119,7 +115,7 @@ clean-unix:: clean-libobjs
 	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS)
 
 clean-windows::
-	$(RM) $(HDRS) $(OBJFILE)
+	$(RM) $(HDRS)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 includes-unix::

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 18:59:42 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Use some of the new library list build rules in
+		win-post.in
+
 Wed Feb  5 20:27:50 1997  Richard Basch  <basch@lehman.com>
 
 	* util_crypt.c: Include k5-int.h as we need to dereference