Use single-colon rules in makefiles

Double-colon rules allow the flexibility to specify commands in
multiple places, but they also make the order of commands and
dependencies dependent on the order of declarations in the Makefile.
Convert all of our double-colon rules to single-colon rules, with the
exception of "clean-unix" and "clean-windows" which have commands
defined in both post.in and in numerous Makefile.in files.

11 files changed, 55 insertions, 63 deletions

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 49078db..20f4dfc 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -21,5 +21,5 @@ all-recurse:
 
 NO_OUTDIR=1
 
-install::
+install:
 	$(INSTALL_SCRIPT) $(srcdir)/krb5-send-pr.sh $(DESTDIR)$(ADMIN_BINDIR)/krb5-send-pr
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index c233347..5671a41 100644
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -67,7 +67,7 @@ SHLIB_EXPLIBS= $(LIBS) $(DL_LIB) $(LIBS_UTILS)
 DEPLIBS=
 
 #
-all-unix:: lib$(LIBBASE)$(SHLIBVEXT)
+all-unix: lib$(LIBBASE)$(SHLIBVEXT)
 
 clean-unix:: clean-libs
 
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index e276fcc..71d59da 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -19,9 +19,9 @@ LIBMINOR=0
 LIBINITFUNC=com_err_initialize
 LIBFINIFUNC=com_err_terminate
 
-all-unix:: all-liblinks
+all-unix: all-liblinks
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-install-unix:: install-libs
+install-unix: install-libs
 
 LINTFLAGS=-uhvb 
 LINTFILES= error_message.c et_name.c com_err.c
@@ -54,7 +54,7 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 
 COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
 
-all-windows:: $(COM_ERR_HDR)
+all-windows: $(COM_ERR_HDR)
 
 $(COM_ERR_HDR): com_err.h
 	$(CP) com_err.h "$@"
@@ -86,9 +86,9 @@ $(OUTPRE)test_et.exe: $(OUTPRE)test_et.$(OBJEXT) $(OUTPRE)test1.$(OBJEXT) \
 	$(OUTPRE)test2.$(OBJEXT) $(CLIB)
 	link $(EXE_LINKOPTS) -out:$(OUTPRE)test_et$(EXEEXT) $**
 
-all-unix:: compile_et includes
+all-unix: compile_et includes
 
-includes:: com_err.h
+includes: com_err.h
 	if cmp $(srcdir)/com_err.h \
 	$(BUILDTOP)/include/com_err.h >/dev/null 2>&1; then :; \
 	else \
@@ -102,23 +102,24 @@ clean-unix::
 
 # test_et doesn't have an interesting exit status, but it'll exercise
 # some cases that t_com_err doesn't, so let's see if it crashes.
-check-unix:: t_com_err test_et
+check-unix: t_com_err test_et
 	$(RUN_TEST) ./test_et
 	$(RUN_TEST) ./t_com_err
 
-check-windows:: $(OUTPRE)test_et$(EXEEXT)
+check-windows: $(OUTPRE)test_et$(EXEEXT)
 	set path=$(BUILDTOP)\lib\$(OUTPRE);%path%;
 	path
 	$(OUTPRE)test_et$(EXEEXT)
 
-install-unix:: compile_et
+install-unix: compile_et compile_et.1
 	$(INSTALL) compile_et $(DESTDIR)$(bindir)/compile_et
 	test -d $(DESTDIR)$(mydatadir) || mkdir $(DESTDIR)$(mydatadir)
 	$(INSTALL_DATA) $(srcdir)/et_c.awk $(DESTDIR)$(mydatadir)
 	$(INSTALL_DATA) $(srcdir)/et_h.awk $(DESTDIR)$(mydatadir)
+	$(INSTALL_DATA) $(srcdir)/compile_et.1 $(DESTDIR)$(CLIENT_MANDIR)/compile_et.1
 
 
-install-headers:: compile_et
+install-headers: compile_et
 
 compile_et: $(srcdir)/compile_et.sh $(srcdir)/config_script
 	$(SHELL) $(srcdir)/config_script $(srcdir)/compile_et.sh \
@@ -136,20 +137,17 @@ rebuild-h:
 clean-unix::
 	$(RM) compile_et
 
-depend:: 
+depend:
 
-install:: com_err.h 
+install: com_err.h
 	$(INSTALL_DATA) $(srcdir)/com_err.h  $(DESTDIR)$(KRB5_INCDIR)/com_err.h
 
-install-unix:: compile_et.1
-	$(INSTALL_DATA) $(srcdir)/compile_et.1 $(DESTDIR)$(CLIENT_MANDIR)/compile_et.1
-
 
 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
 
 clean-unix:: clean-files
 
-clean-files::
+clean-files:
 	rm -f *~ \#* *.bak \
 		*.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
 		*.cp *.fn *.ky *.log *.pg *.tp *.vr \
@@ -175,7 +173,7 @@ archive:	et.tar
 TAGS:	et_name.c error_message.c
 	etags et_name.c error_message.c
 
-depend::  includes compile_et
+depend:  includes compile_et
 
 
 @lib_frag@
diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index 82f5391..29a1556 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -80,7 +80,7 @@ HEADERS= \
 	profile.h \
 	$(COM_ERR_DEPS)
 
-check-pytests:: t_kgss_user t_kgss_kernel
+check-pytests: t_kgss_user t_kgss_kernel
 	$(RUNPYTEST) $(srcdir)/t_kgss.py $(PYTESTFLAGS)
 
 libkgss.a: $(OBJS)
@@ -97,9 +97,9 @@ t_kgss_kernel: libkgss.a t_kgss_kernel.o t_kgss_common.o $(K5CRYPTO_DEPLIB) \
 	$(CC_LINK) -o $@ t_kgss_kernel.o t_kgss_common.o libkgss.a \
 		$(K5CRYPTO_LIB) $(SUPPORT_LIB)
 
-depend:: $(SRCS) $(HEADERS)
+depend: $(SRCS) $(HEADERS)
 
-clean::
+clean:
 	$(RM) $(SRCS) $(HEADERS) libkgss.a testlog OBJS.SH
 	$(RM) -r gssapi krb5 testdir
 	$(RM) t_kgss_user.o t_kgss_kernel.o t_kgss_common.o
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 942c85d..ba589c4 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -51,18 +51,18 @@ SHLIB_EXPLIBS = -lcom_err $(SUPPORT_LIB) $(LIBS)
 
 PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
 
-all-unix:: includes 
-all-unix:: all-libs
-all-windows:: $(PROFILE_HDR)
+all-unix: includes
+all-unix: all-libs
+all-windows: $(PROFILE_HDR)
 
-install-headers-unix:: includes
+install-headers-unix: includes
 
 generate-files-mac: profile.h
 
-$(PROFILE_HDR):: profile.h
+$(PROFILE_HDR): profile.h
 	$(CP) profile.h "$@"
 
-includes:: $(PROFILE_HDR)
+includes: $(PROFILE_HDR)
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/profile.h test2.ini test3.ini test2.ini.bak
@@ -135,12 +135,12 @@ clean-unix:: clean-libs clean-libobjs
 clean-windows::
 	$(RM) $(PROFILE_HDR)
 
-check-unix:: test_parse test_profile test_vtable test_load modtest.conf
+check-unix: test_parse test_profile test_vtable test_load modtest.conf
 	$(RUN_TEST) ./test_vtable
 	$(RUN_TEST) ./test_load
 
 DO_TCL=@DO_TCL@
-check-unix:: check-unix-tcl-$(DO_TCL)
+check-unix: check-unix-tcl-$(DO_TCL)
 
 check-unix-tcl-:
 	@echo "+++"
@@ -151,7 +151,7 @@ check-unix-tcl-ok: profile_tcl
 	cp $(srcdir)/test.ini test2.ini
 	$(RUN_TEST) ./profile_tcl $(srcdir)/prof_test1
 
-check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
+check-windows: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
 	$(RM) $(OUTPRE)*.obj
 	$(OUTPRE)test_parse test.ini
 
diff --git a/src/util/profile/testmod/Makefile.in b/src/util/profile/testmod/Makefile.in
index b4e63ff..48a4464 100644
--- a/src/util/profile/testmod/Makefile.in
+++ b/src/util/profile/testmod/Makefile.in
@@ -14,7 +14,7 @@ STLIBOBJS=testmod_main.o
 
 SRCS=$(srcdir)/testmod_main.c
 
-check-unix:: proftest$(DYNOBJEXT)
+check-unix: proftest$(DYNOBJEXT)
 clean-unix:: clean-libs clean-libobjs
 
 @libnover_frag@
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 0e2e47d..a7da5fc 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -5,7 +5,7 @@ SED = sed
 INSTALLLIB=cp
 INSTALLFILE=cp
 
-all::
+all:
 
 TOP=$(BUILDTOP)
 
@@ -15,7 +15,7 @@ LIBMINOR=0
 RELDIR=../util/ss
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
-install-unix:: install-libs
+install-unix: install-libs
 
 # hard coded srcdir/.. is so that ss/ss.h works
 
@@ -55,15 +55,15 @@ MKCMDSOBJS=	mk_cmds.o utils.o options.o ct.tab.o cmd_tbl.lex.o
 # stuff to build
 #
 
-all-unix::	mk_cmds ct_c.awk ct_c.sed includes # libss_p.a lint
-all-unix:: all-liblinks
-all-windows::  all-unix
+all-unix:	mk_cmds ct_c.awk ct_c.sed includes # libss_p.a lint
+all-unix: all-liblinks
+all-windows:  all-unix
 
 dist:	archives
 
-install::
+install:
 
-includes:: mk_cmds ct_c.sed ct_c.awk ss_err.h
+includes: mk_cmds ct_c.sed ct_c.awk ss_err.h
 
 HDRDIR=$(BUILDTOP)/include/ss
 HDRS =	$(HDRDIR)/ss.h \
@@ -75,7 +75,7 @@ SRC_HDRS_DEP = $(srcdir)/ss.h
 
 generate-files-mac: ct_c.awk ct_c.sed std_rqs.c ss_err.h
 
-includes:: $(HDRS)
+includes: $(HDRS)
 $(HDRDIR)/timestamp:
 	if [ -d $(HDRDIR) ] ; then :; else mkdir -p $(HDRDIR); fi
 	echo timestamp > $(HDRDIR)/timestamp
@@ -96,10 +96,7 @@ ss_err.h: ss_err.et
 
 ss_err.c: ss_err.et
 
-clean::
-	$(RM) ss_err.o ss_err.c ss_err.h std_rqs.c
-
-depend:: ss_err.h
+depend: ss_err.h
 
 ct.tab.c ct.tab.h: ct.y
 	$(RM) ct.tab.* y.*
@@ -114,7 +111,7 @@ ct.tab.c ct.tab.h: ct.y
 #
 #mk_cmds.o:	ss_err.h
 #
-#install::
+#install:
 #	$(INSTALLPROG) mk_cmds ${DESTDIR}$(PROGDIR)/mk_cmds
 
 mk_cmds: $(srcdir)/mk_cmds.sh $(srcdir)/config_script 
@@ -128,12 +125,9 @@ ct_c.awk: $(srcdir)/ct_c_awk.in
 ct_c.sed: $(srcdir)/ct_c_sed.in
 	$(SED) -e '/^#/d' $(srcdir)/ct_c_sed.in > ct_c.sed
 
-clean::
+clean:
+	$(RM) ss_err.o ss_err.c ss_err.h std_rqs.c
 	$(RM) mk_cmds ct_c.awk ct_c.sed $(MKCMDSOBJS)
-
-# 
-
-clean::
 	rm -f *.o *~ \#* *.bak core \
 		ss_err.h ct.tab.c ct.tab.h cmd_tbl.lex.c \
 		lex.yy.c y.tab.c \
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index d5da898..6239e41 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -153,9 +153,9 @@ SHLIB_EXPLIBS= $(LIBS) $(DL_LIB)
 DEPLIBS=
 
 #
-all-unix:: all-liblinks
+all-unix: all-liblinks
 
-install-unix:: install-libs
+install-unix: install-libs
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
@@ -168,7 +168,7 @@ t_mktime: gmt_mktime.c
 	$(CC) $(ALL_CFLAGS) -DTEST_LEAP -o t_mktime $(srcdir)/gmt_mktime.c
 
 SHLIB_EXPORT_FILE=libkrb5support.exports
-##DOS##all-windows:: libkrb5support.exports
+##DOS##all-windows: libkrb5support.exports
 
 EXTRA_SUPPORT_SYMS= @EXTRA_SUPPORT_SYMS@
 ##DOS##EXTRA_SUPPORT_SYMS= krb5int_mkstemp krb5int_strlcpy krb5int_strlcat \
@@ -222,7 +222,7 @@ t_utf8: t_utf8.o utf8.o
 
 TEST_PROGS= t_k5buf t_path t_path_win t_base64 t_json t_unal t_utf8
 
-check-unix:: $(TEST_PROGS)
+check-unix: $(TEST_PROGS)
 	./t_k5buf
 	./t_path
 	./t_path_win
@@ -231,7 +231,7 @@ check-unix:: $(TEST_PROGS)
 	./t_unal
 	./t_utf8
 
-clean::
+clean:
 	$(RM) t_k5buf.o t_k5buf t_unal.o t_unal path_win.o path_win
 	$(RM) t_path_win.o t_path_win t_path.o t_path t_base64.o t_base64
 	$(RM) t_json.o t_json libkrb5support.exports t_utf8.o t_utf8
diff --git a/src/util/verto/Makefile.in b/src/util/verto/Makefile.in
index 0d51cb8..28e5ddf 100644
--- a/src/util/verto/Makefile.in
+++ b/src/util/verto/Makefile.in
@@ -27,21 +27,21 @@ rename.h: $(srcdir)/Symbols.ev
 	$(RM) $@
 	$(SED) -e 's/.*/#define & k5&/' < $(srcdir)/Symbols.ev > $@
 
-all-unix:: all-liblinks includes
+all-unix: all-liblinks includes
 
-install-unix:: install-libs
+install-unix: install-libs
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 	$(RM) $(VERTO_HDR) rename.h
 
-includes:: $(VERTO_HDR)
-depend:: $(VERTO_HDR) rename.h
+includes: $(VERTO_HDR)
+depend: $(VERTO_HDR) rename.h
 
 $(VERTO_HDR): $(srcdir)/verto.h
 	$(RM) $@
 	$(CP) $(srcdir)/verto.h $@
 
-install::
+install:
 	$(INSTALL_DATA) $(srcdir)/verto.h $(DESTDIR)$(KRB5_INCDIR)/verto.h
 	$(INSTALL_DATA) $(srcdir)/verto-module.h \
 		$(DESTDIR)$(KRB5_INCDIR)/verto-module.h
diff --git a/src/util/windows/Makefile.in b/src/util/windows/Makefile.in
index 65b323c..bf0892f 100644
--- a/src/util/windows/Makefile.in
+++ b/src/util/windows/Makefile.in
@@ -1,12 +1,12 @@
 BUILDTOP = ..\..
 
-all-windows:: $(OUTPRE)libecho.exe
+all-windows: $(OUTPRE)libecho.exe
 
 $(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj
 	link -out:$@ $** $(SCLIB)
 	$(_VC_MANIFEST_EMBED_EXE)
 	
-install-windows::
+install-windows:
 
 clean-windows::
 	$(RM) $(OUTPRE)*.res $(OUTPRE)*.map $(OUTPRE)*.obj $(OUTPRE)*.exe $(OUTPRE)*.manifest
diff --git a/src/util/wshelper/Makefile.in b/src/util/wshelper/Makefile.in
index 5abf2e5..75a9698 100644
--- a/src/util/wshelper/Makefile.in
+++ b/src/util/wshelper/Makefile.in
@@ -46,8 +46,8 @@ DEFINES = $(DEFINES)
 DEFINES = $(DEFINES) -DDBG
 !endif
 
-all-windows::
-all-windows:: $(OUTPRE)$(DLL_NAME).dll
+all-windows:
+all-windows: $(OUTPRE)$(DLL_NAME).dll
 
 clean-windows::
 	$(RM) $(OUTPRE)$(DLL_NAME).dll