From c3e44df09c5441551499da92ae1ccf8202394d4b Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Mon, 25 Sep 1995 20:55:45 +0000 Subject: [PATCH] Removed "foo:: foo-$(WHAT)" lines from the Makefile git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6859 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/des425/ChangeLog | 5 +++++ src/lib/des425/Makefile.in | 6 +----- src/lib/gssapi/ChangeLog | 5 +++++ src/lib/gssapi/Makefile.in | 4 ---- src/lib/gssapi/generic/ChangeLog | 5 +++++ src/lib/gssapi/generic/Makefile.in | 10 +++------- src/lib/gssapi/krb5/ChangeLog | 5 +++++ src/lib/gssapi/krb5/Makefile.in | 6 +++--- src/lib/kadm/ChangeLog | 5 +++++ src/lib/kadm/Makefile.in | 5 +---- src/lib/krb4/ChangeLog | 5 +++++ src/lib/krb4/Makefile.in | 6 +----- 12 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 8851b64cd..026b50e6c 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:51:10 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) * string2key.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 186d64855..ed77cbc33 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -53,8 +53,6 @@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a DEPKLIB= $(TOPLIBD)/libcrypto.a -all:: all-$(WHAT) - all-unix:: shared $(OBJS) all-mac:: $(OBJS) all-windows:: $(OBJS) @@ -65,8 +63,6 @@ shared: verify: verify.o libdes425.a $(DEPKLIB) $(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB) -check:: check-$(WHAT) - check-unix:: verify ./verify -z ./verify -m @@ -74,7 +70,7 @@ check-unix:: verify check-windows:: -clean:: clean-$(WHAT) +clean:: $(RM) verify$(EXEEXT) verify.$(OBJEXT) clean-unix:: diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index 8e5b11d96..fc3941870 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:52:41 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Wed Sep 13 11:11:38 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: Put back in all:: all-$(WHAT) rule--PC needs it. diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 53229c8ce..7d7debdc5 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -3,8 +3,6 @@ TST=if test -n "`cat DONE`" ; then ##DOSBUILDTOP = ..\.. ##DOS!include $(BUILDTOP)\config\windows.in -all:: all-$(WHAT) - all-unix:: all-mac:: @@ -18,8 +16,6 @@ install:: libgssapi_krb5.a $(INSTALL_DATA) libgssapi_krb5.a $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a -clean:: clean-$(WHAT) - clean-unix:: $(RM) libgssapi_krb5.a diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 751a497f3..d123ad025 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:53:00 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Wed Sep 13 10:36:32 1995 Keith Vetter (keithv@fusion.com) * oid_ops.c: signed/unsigned mismatch, removed unused variables. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 2db4458d9..9beb8ee7e 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -61,21 +61,17 @@ SRCS= $(ETSRCS) $(CCSRCS) OBJS= $(ETOBJS) $(CCOBJS) HDRS= $(ETHDRS) -all:: all-$(WHAT) $(SRCS) $(HDRS) includes $(OBJS) +all-unix:: $(SRCS) $(HDRS) includes $(OBJS) -all-unix:: +all-mac:: $(SRCS) $(HDRS) includes $(OBJS) -all-mac:: - -all-windows:: +all-windows:: $(SRCS) $(HDRS) includes $(OBJS) if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) copy gssapi.h $(EHDRDIR) copy gssapi_generic.h $(EHDRDIR) unixmac: $(SRCS) $(HDRS) includes -clean:: clean-$(WHAT) - clean-unix:: $(RM) $(ETHDRS) $(ETSRCS) diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 591b426c3..1a277eb17 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:52:49 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Sun Sep 24 10:39:13 1995 John Rivlin (jrivlin@fusion.com) * gssapiP_krb5.h: Fixed kb_seal_size prototype diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index cc5e1f101..9c6003f44 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -93,9 +93,9 @@ HDRS= $(ETHDRS) EHDRDIR=$(TOP)/include/gssapi -all:: $(SRCS) $(HDRS) includes $(OBJS) - -clean:: clean-$(WHAT) +all-unix:: $(SRCS) $(HDRS) includes $(OBJS) +all-mac:: $(SRCS) $(HDRS) includes $(OBJS) +all-windows:: $(SRCS) $(HDRS) includes $(OBJS) clean-unix:: $(RM) $(ETHDRS) $(ETSRCS) diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index eb0357eb1..d4395dd57 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:54:18 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Fri Sep 22 12:00:00 1995 James Mattly * adm_conn.c: for sockets changed close to closesocket, sockets on diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in index 88b7f1b9b..abe213794 100644 --- a/src/lib/kadm/Makefile.in +++ b/src/lib/kadm/Makefile.in @@ -30,7 +30,7 @@ SRCS= $(srcdir)/adm_conn.c \ $(srcdir)/str_conv.c \ $(srcdir)/keysalt.c -all:: all-$(WHAT) $(BASE_OBJS) +all:: $(BASE_OBJS) all-unix:: $(DB_OBJS) $(UNIX_OBJS) all-unix:: libkadm.a @@ -46,7 +46,6 @@ install:: libkadm.a $(INSTALL_DATA) libkadm.a $(DESTDIR)$(KRB5_LIBDIR)/libkadm.a $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkadm.a -clean:: clean-$(WHAT) clean-unix:: $(RM) libkadm.$(LIBEXT) $(UNIX_OBJS) clean-mac:: @@ -77,8 +76,6 @@ t_ktentry: $(T_KTENTRY_OBJS) TEST_PROGS = t_dbentry t_ktentry -check:: check-$(WHAT) - check-unix:: $(TEST_PROGS) ./t_dbentry -r 100 ./t_ktentry -r 100 diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 0c0116570..032d3c0e2 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 25 16:54:34 1995 Theodore Y. Ts'o + + * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the + Makefile. + Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) * DNR.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 38d4e5831..a246c4bde 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -1,4 +1,3 @@ -WHAT=unix CFLAGS = $(CCOPTS) $(DEFS) $(DEFINES) DEFINES=-I$(srcdir)/../../include/kerberosIV @@ -168,7 +167,6 @@ all:: all-really # NMAKE expands the macros in dependency lines before it finishes reading # the whole file (sigh)... all-really:: all-$(WHAT) -install:: install-$(WHAT) # We want *library* compiler options... DBG=$(DBG_LIB) @@ -241,7 +239,7 @@ kerberos.dll: kerberos.def winsock.lib \ del c.lib rc /p /k $@ -clean:: clean-$(WHAT) +clean:: -$(RM) $(LIBNAME) -$(RM) *.$(OBJEXT) @@ -274,8 +272,6 @@ install-unix:: $(CHMOD) 444 $(DESTDIR)$(KRB5_LIBDIR)/$(LIBNAME) -check:: check-$(WHAT) - check-unix:: $(TEST_PROGS) check-mac:: $(TEST_PROGS) -- 2.26.2