From 7873d6d09b9e7d82c891f475d0aea080548e9ca9 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 6 Jun 1996 20:37:07 +0000 Subject: [PATCH] Don't pass $(LIBCMD) on the command line. It's set in the windows.in prologue for all Makefiles anyway. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8271 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 3 +++ src/Makefile.in | 11 +++++------ src/lib/ChangeLog | 5 +++++ src/lib/Makefile.in | 8 ++++---- src/lib/crypto/ChangeLog | 5 +++++ src/lib/crypto/Makefile.in | 12 ++++++------ src/lib/gssapi/ChangeLog | 5 +++++ src/lib/gssapi/Makefile.in | 6 +++--- src/lib/krb5/ChangeLog | 5 +++++ src/lib/krb5/Makefile.in | 18 +++++++++--------- src/lib/krb5/ccache/ChangeLog | 5 +++++ src/lib/krb5/ccache/Makefile.in | 2 +- src/lib/krb5/keytab/ChangeLog | 5 +++++ src/lib/krb5/keytab/Makefile.in | 2 +- src/util/berk_db/ChangeLog | 5 +++++ src/util/berk_db/Makefile.in | 2 +- 16 files changed, 68 insertions(+), 31 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9605d5c9f..a3390877b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + * patchlevel.h (KRB5_MINOR_RELEASE): Update patchlevel for Beta 6 release. * Makefile.in (FILES): Include lib/crypto/sha/* in list of files diff --git a/src/Makefile.in b/src/Makefile.in index 495aa04ca..160598605 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -9,23 +9,22 @@ all-unix:: all-mac:: -LIBCMD = lib all-windows:: makefile-windows @echo Making in include cd include - -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MAKEFLAGS) @echo Making in util\et cd ..\util\et - -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MAKEFLAGS) @echo Making in util\profile cd ..\profile - -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MAKEFLAGS) @echo Making in lib cd ..\..\lib - -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MAKEFLAGS) @echo Making in windows cd ..\windows - -$(MAKE) -$(MAKEFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MAKEFLAGS) cd .. world:: diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index c853bc6d4..184397537 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Tue May 7 20:18:13 1996 Ezra Peisach * configure.in: libdes425 now depends on libkrb5. diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 57b06491d..9b1d7e3ec 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -58,16 +58,16 @@ winsock.lib: winsock.def all-windows:: @echo Making in lib\crypto cd crypto - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) @echo Making in lib\kadm cd ..\kadm - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) @echo Making in lib\krb5 cd ..\krb5 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) @echo Making in lib\gssapi cd ..\gssapi - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) @echo Making in lib cd .. diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index d8c97f5f5..680319932 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Thu Jun 6 00:03:05 1996 Theodore Y. Ts'o * Makefile.in (MAC_SUBDIRS): Include sha in the list of diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index e4ec74294..19243e675 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -73,23 +73,23 @@ check-unix:: all-windows:: cd crc32 @echo Making in crypto\crc32 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\des @echo Making in crypto\des - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\md4 @echo Making in crypto\md4 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\os @echo Making in crypto\os - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) rem BUG WITH NMAKE cd ..\md5 @echo Making in crypto\md5 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\sha @echo Making in crypto\sha - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. clean-windows:: diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index d4cb19dbb..0ad7c89bd 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Mon May 20 11:00:45 1996 Tom Yu * Makefile.in (libgssapi.$(STEXT)): deal with new improved diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 8bc335607..c27788dc2 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -47,13 +47,13 @@ clean-windows:: all-windows:: cd generic @echo Making in gssapi\generic - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\krb5 @echo Making in gssapi\krb5 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\mechglue @echo Making in gssapi\mechglue - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. clean-windows:: diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 5ee3aa22b..aa408ef16 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Mon May 20 10:56:51 1996 Tom Yu * Makefile.in (libkrb5.$(STEXT)): fix sense of test; also deal diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index a2b2bf927..74ffe8951 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -49,31 +49,31 @@ clean-windows:: all-windows:: cd ASN.1 @echo Making in lib\asn.1 - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\CCACHE @echo Making in lib\ccache - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\ERROR_TA @echo Making in lib\error_ta - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\FREE @echo Making in lib\free - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\KEYTAB @echo Making in lib\keytab - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\KRB @echo Making in lib\krb - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\OS @echo Making in lib\os - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\POSIX @echo Making in lib\posix - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd ..\RCACHE @echo Making in lib\rcache - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. clean-windows:: diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index a19a75ef9..56cea9297 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Wed Feb 7 00:23:18 1996 Theodore Y. Ts'o * Makefile.in: Folded in danw's changes to allow diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index db6e6efb3..c95b6f7a9 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -25,7 +25,7 @@ all-mac:: $(OBJS) all-windows:: $(OBJS) cd FILE @echo Making in ccache\file - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. shared: diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index e90e44101..e860ba5cd 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Wed Feb 7 00:23:18 1996 Theodore Y. Ts'o * Makefile.in: Folded in danw's changes to allow diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index cdf7a5060..760fc4e97 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -33,7 +33,7 @@ all-mac:: $(OBJS) all-windows:: $(OBJS) cd file @echo Making in keytab\file - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. clean-unix:: diff --git a/src/util/berk_db/ChangeLog b/src/util/berk_db/ChangeLog index 4cf149863..c83b051cc 100644 --- a/src/util/berk_db/ChangeLog +++ b/src/util/berk_db/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 6 00:04:38 1996 Theodore Y. Ts'o + + * Makefile.in (all-windows): Don't pass $(LIBCMD) on the command + line. It's set in the windows.in prologue for all Makefiles anyway. + Mon May 20 21:08:01 1996 Theodore Ts'o * Makefile.in: Update use of libupdate to use the new command line diff --git a/src/util/berk_db/Makefile.in b/src/util/berk_db/Makefile.in index ce3a4e045..3e7b67f4f 100644 --- a/src/util/berk_db/Makefile.in +++ b/src/util/berk_db/Makefile.in @@ -34,7 +34,7 @@ clean-windows:: all-windows:: cd BERK_DB @echo Making in berk_db - -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) + -$(MAKE) -$(MFLAGS) cd .. clean-windows:: -- 2.26.2