diff options
author | Greg Hudson <ghudson@mit.edu> | 2016-07-26 13:32:08 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2016-07-28 11:53:44 -0400 |
commit | 035a1c2b3d97479692edac9844eaed385d00cd4f (patch) | |
tree | cca981d1be07e7cc20bc2c460763e2769ec071ef /src/clients | |
parent | 5392327b479fd1b964fd72b3b3a0b5b3e04df3a6 (diff) | |
download | krb5-035a1c2b3d97479692edac9844eaed385d00cd4f.zip krb5-035a1c2b3d97479692edac9844eaed385d00cd4f.tar.gz krb5-035a1c2b3d97479692edac9844eaed385d00cd4f.tar.bz2 |
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.
Diffstat (limited to 'src/clients')
-rw-r--r-- | src/clients/kcpytkt/Makefile.in | 8 | ||||
-rw-r--r-- | src/clients/kdeltkt/Makefile.in | 8 | ||||
-rw-r--r-- | src/clients/kdestroy/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/kinit/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/klist/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/kpasswd/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/ksu/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/kswitch/Makefile.in | 6 | ||||
-rw-r--r-- | src/clients/kvno/Makefile.in | 6 |
9 files changed, 29 insertions, 29 deletions
diff --git a/src/clients/kcpytkt/Makefile.in b/src/clients/kcpytkt/Makefile.in index 8b70201..cad4dd4 100644 --- a/src/clients/kcpytkt/Makefile.in +++ b/src/clients/kcpytkt/Makefile.in @@ -11,9 +11,9 @@ BUILDTOP=$(REL)..$(S).. ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKCPYTKT_APP -fo $@ -r $** -all-unix:: kcpytkt -##WIN32##all-windows:: $(KCPYTKT) -all-mac:: +all-unix: kcpytkt +##WIN32##all-windows: $(KCPYTKT) +all-mac: kcpytkt: kcpytkt.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ kcpytkt.o $(KRB5_BASE_LIBS) @@ -25,7 +25,7 @@ kcpytkt: kcpytkt.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) kcpytkt.o kcpytkt -install-unix:: +install-unix: for f in kcpytkt; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kdeltkt/Makefile.in b/src/clients/kdeltkt/Makefile.in index 529592a..b7e0e73 100644 --- a/src/clients/kdeltkt/Makefile.in +++ b/src/clients/kdeltkt/Makefile.in @@ -11,9 +11,9 @@ BUILDTOP=$(REL)..$(S).. ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKDELTKT_APP -fo $@ -r $** -all-unix:: kdeltkt -##WIN32##all-windows:: $(KDELTKT) -all-mac:: +all-unix: kdeltkt +##WIN32##all-windows: $(KDELTKT) +all-mac: kdeltkt: kdeltkt.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ kdeltkt.o $(KRB5_BASE_LIBS) @@ -25,7 +25,7 @@ kdeltkt: kdeltkt.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) kdeltkt.o kdeltkt -install-unix:: +install-unix: for f in kdeltkt; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index 05f0a44..beb7d6f 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -15,8 +15,8 @@ SRCS=kdestroy.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKDESTROY_APP -fo $@ -r $** -all-unix:: kdestroy -##WIN32##all-windows:: $(KDESTROY) +all-unix: kdestroy +##WIN32##all-windows: $(KDESTROY) kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ kdestroy.o $(KRB5_BASE_LIBS) @@ -28,7 +28,7 @@ kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) kdestroy.o kdestroy -install-unix:: +install-unix: for f in kdestroy; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index c7975c9..9d02174 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -14,8 +14,8 @@ SRCS=kinit.c kinit_kdb.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKINIT_APP -fo $@ -r $** -all-unix:: kinit -##WIN32##all-windows:: $(KINIT) +all-unix: kinit +##WIN32##all-windows: $(KINIT) kinit: kinit.o kinit_kdb.o $(KRB5_BASE_DEPLIBS) $(KADMSRV_DEPLIBS) $(CC_LINK) -o $@ kinit.o kinit_kdb.o $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) @@ -27,7 +27,7 @@ kinit: kinit.o kinit_kdb.o $(KRB5_BASE_DEPLIBS) $(KADMSRV_DEPLIBS) clean-unix:: $(RM) kinit.o kinit_kdb.o kinit -install-unix:: +install-unix: for f in kinit; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 79255f2..b93d567 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -15,8 +15,8 @@ SRCS = klist.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKLIST_APP -fo $@ -r $** -all-unix:: klist -##WIN32##all-windows:: $(KLIST) +all-unix: klist +##WIN32##all-windows: $(KLIST) klist: klist.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ klist.o $(KRB5_BASE_LIBS) @@ -28,7 +28,7 @@ klist: klist.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) klist.o klist -install-unix:: +install-unix: for f in klist; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in index 3445c9f..bd4a08c 100644 --- a/src/clients/kpasswd/Makefile.in +++ b/src/clients/kpasswd/Makefile.in @@ -22,15 +22,15 @@ ksetpwd.o: $(srcdir)/ksetpwd.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKPASSWD_APP -fo $@ -r $** -all-unix:: kpasswd ksetpwd +all-unix: kpasswd ksetpwd clean-unix:: $(RM) kpasswd.o kpasswd ksetpwd.o ksetpwd -install-all install-kdc install-server install-client install-unix:: +install-all install-kdc install-server install-client install-unix: $(INSTALL_PROGRAM) kpasswd $(DESTDIR)$(CLIENT_BINDIR)/`echo kpasswd|sed '$(transform)'` -##WIN32##all-windows:: $(KPWD) +##WIN32##all-windows: $(KPWD) ##WIN32##$(KPWD): $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) $(EXERES) ##WIN32## link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB) diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in index c705fda..b2fcbf2 100644 --- a/src/clients/ksu/Makefile.in +++ b/src/clients/ksu/Makefile.in @@ -20,15 +20,15 @@ OBJS = \ heuristic.o \ xmalloc.o @SETENVOBJ@ -all:: ksu +all: ksu ksu: $(OBJS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS) -clean:: +clean: $(RM) ksu -install:: +install: -for f in ksu; do \ $(INSTALL_SETUID) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kswitch/Makefile.in b/src/clients/kswitch/Makefile.in index e2a58dc..e3d3680 100644 --- a/src/clients/kswitch/Makefile.in +++ b/src/clients/kswitch/Makefile.in @@ -13,8 +13,8 @@ SRCS=kswitch.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKSWITCH_APP -fo $@ -r $** -all-unix:: kswitch -##WIN32##all-windows:: $(KSWITCH) +all-unix: kswitch +##WIN32##all-windows: $(KSWITCH) kswitch: kswitch.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ kswitch.o $(KRB5_BASE_LIBS) @@ -26,7 +26,7 @@ kswitch: kswitch.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) kswitch.o kswitch -install-unix:: +install-unix: for f in kswitch; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in index 6495080..1c3f793 100644 --- a/src/clients/kvno/Makefile.in +++ b/src/clients/kvno/Makefile.in @@ -15,9 +15,9 @@ SRCS=kvno.c ##WIN32##$(EXERES): $(VERSIONRC) ##WIN32## $(RC) $(RCFLAGS) -DKVNO_APP -fo $@ -r $** -all-unix:: kvno +all-unix: kvno -##WIN32##all-windows:: $(KVNO) +##WIN32##all-windows: $(KVNO) kvno: kvno.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ kvno.o $(KRB5_BASE_LIBS) @@ -29,7 +29,7 @@ kvno: kvno.o $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) kvno.o kvno -install-unix:: +install-unix: for f in kvno; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ |