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 | |
| 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')
158 files changed, 571 insertions, 587 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 5e4445a..08c05d3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -50,9 +50,9 @@ update-autoconf-h: config.status: $(top_srcdir)/config/shlib.conf ##DOS##!endif -all-windows:: maybe-awk Makefile-windows +all-windows: maybe-awk Makefile-windows -world:: +world: date make $(MFLAGS) all date @@ -88,13 +88,13 @@ install-headers-mkdirs: $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc install-headers-prerecurse: install-headers-mkdirs -# install:: +# install: # $(MAKE) $(MFLAGS) install.man TAGS: $(SRCS) etags $(SRCS) -clean-:: clean-windows +clean-: clean-windows clean-unix:: $(RM) *.o core @@ -135,7 +135,7 @@ tgz-bin: pkgdir # Microsoft Windows build process... # -config-windows:: Makefile-windows +config-windows: Makefile-windows # @echo Making in include # cd include # $(MAKE) -$(MFLAGS) @@ -194,7 +194,7 @@ WINMAKEFILES=Makefile \ windows\leashdll\Makefile windows\leash\Makefile \ windows\leash\htmlhelp\Makefile -##DOS##Makefile-windows:: $(MKFDEP) $(WINMAKEFILES) +##DOS##Makefile-windows: $(MKFDEP) $(WINMAKEFILES) ##DOS##Makefile: Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ @@ -453,17 +453,17 @@ awk-windows-mac: $(ETOUT) $(HOUT) # The maybe-awk target needs to happen after AWK is defined. # -##DOS##maybe-awk:: +##DOS##maybe-awk: ##DOS##!ifdef WHICH_CMD ##DOS##!if ![ $(WHICH_CMD) $(AWK) ] -##DOS##maybe-awk:: awk-windows-mac +##DOS##maybe-awk: awk-windows-mac ##DOS##!endif ##DOS##!endif clean-windows-mac: rm -f $(CLEANUP) -distclean-windows: +distclean-windows:: config\rm.bat $(CLEANUP:^/=^\) config\rm.bat $(WINMAKEFILES) config\rm.bat $(KBINDIR)\*.dll $(KBINDIR)\*.exe @@ -471,7 +471,7 @@ distclean-windows: # Avoid using $(CP) here because the nul+ hack breaks implicit # destination filenames. -install-windows:: +install-windows: @if "$(KRB_INSTALL_DIR)"=="" @echo KRB_INSTALL_DIR is not defined! Please define it. @if "$(KRB_INSTALL_DIR)"=="" @dir /b \nul\nul @if not exist "$(KRB_INSTALL_DIR)\$(NULL)" @echo The directory $(KRB_INSTALL_DIR) does not exist. Please create it. @@ -687,25 +687,25 @@ FIND_REINDENT = cd $(top_srcdir) && \ $(FIND) $(INDENTDIRS) \( $(EXCLUDES) \) -prune -o \ \( -name '*.[ch]' -o -name '*.hin' -o -name '*.[ch].in' \) -show-reindentfiles:: +show-reindentfiles: ($(FIND_REINDENT) -print) -reindent:: +reindent: ($(FIND_REINDENT) \ -print0 | $(XARGS) -0 $(EMACS) -q -batch \ -l util/krb5-c-style.el \ -l util/krb5-batch-reindent.el) -mark-cstyle:: mark-cstyle-krb5 mark-cstyle-bsd +mark-cstyle: mark-cstyle-krb5 mark-cstyle-bsd -mark-cstyle-krb5:: +mark-cstyle-krb5: (cd $(top_srcdir) && \ $(FIND) $(INDENTDIRS) \( $(EXCLUDES) \) -prune -o \ -name '*.[ch]' \ -print0 | $(XARGS) -0 $(PYTHON) util/krb5-mark-cstyle.py \ --cstyle=krb5) -mark-cstyle-bsd:: +mark-cstyle-bsd: (cd $(top_srcdir) && $(FIND) $(BSDFILES) -print0 | $(XARGS) -0 \ $(PYTHON) util/krb5-mark-cstyle.py --cstyle=bsd) diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index 0f67c0c..28e59f9 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -6,7 +6,7 @@ SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c OBJS= gss-client.o gss-misc.o gss-server.o -all-unix:: gss-server gss-client +all-unix: gss-server gss-client ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY @@ -23,7 +23,7 @@ all-unix:: gss-server gss-client ##WIN32## $(RC) $(RCFLAGS) -DGSS_SERVER_APP -fo $@ -r $** -##WIN32##all-windows:: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe +##WIN32##all-windows: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe gss-server: gss-server.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) @@ -42,9 +42,9 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) clean-unix:: $(RM) gss-server gss-client -check-pytests:: +check-pytests: $(RUNPYTEST) $(srcdir)/t_gss_sample.py $(PYTESTFLAGS) -install-unix:: +install-unix: $(INSTALL_PROGRAM) gss-client $(DESTDIR)$(CLIENT_BINDIR)/gss-client $(INSTALL_PROGRAM) gss-server $(DESTDIR)$(SERVER_BINDIR)/gss-server diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 3d8df33..b09cc09 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,13 +1,13 @@ mydir=appl$(S)sample$(S)sclient BUILDTOP=$(REL)..$(S)..$(S).. -all:: sclient +all: sclient sclient: sclient.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o sclient sclient.o $(KRB5_BASE_LIBS) -clean:: +clean: $(RM) sclient.o sclient -install:: +install: $(INSTALL_PROGRAM) sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 634e5a6..c2e6d40 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,13 +1,13 @@ mydir=appl$(S)sample$(S)sserver BUILDTOP=$(REL)..$(S)..$(S).. -all:: sserver +all: sserver sserver: sserver.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o sserver sserver.o $(KRB5_BASE_LIBS) -clean:: +clean: $(RM) sserver.o sserver -install:: +install: $(INSTALL_PROGRAM) sserver ${DESTDIR}$(SERVER_BINDIR)/sserver diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index d59baac..3859fce 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -1,15 +1,15 @@ mydir=appl$(S)simple$(S)client BUILDTOP=$(REL)..$(S)..$(S).. -all:: sim_client +all: sim_client LOCALINCLUDES= -I$(srcdir)/.. sim_client: sim_client.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS) -install:: +install: $(INSTALL_PROGRAM) sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client -clean:: +clean: $(RM) sim_client.o sim_client diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index a992645..83f4fcc 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -3,13 +3,13 @@ BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES= -I$(srcdir)/.. -all:: sim_server +all: sim_server sim_server: sim_server.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o sim_server sim_server.o $(KRB5_BASE_LIBS) -install:: +install: $(INSTALL_PROGRAM) sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server -clean:: +clean: $(RM) sim_server.o sim_server diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 8640860..8b553f1 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -3,23 +3,20 @@ BUILDTOP=$(REL)..$(S).. # If you remove the -DDEBUG, the test program needs a line changed DEFINES = -DDEBUG -all:: uuclient uuserver +all: uuclient uuserver -check-pytests:: uuclient uuserver +check-pytests: uuclient uuserver $(RUNPYTEST) $(srcdir)/t_user2user.py $(PYTESTFLAGS) uuclient: client.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o uuclient client.o $(KRB5_BASE_LIBS) -clean:: - $(RM) client.o uuclient - uuserver: server.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o uuserver server.o $(KRB5_BASE_LIBS) -install:: +install: $(INSTALL_PROGRAM) uuclient $(DESTDIR)$(CLIENT_BINDIR)/uuclient $(INSTALL_PROGRAM) uuserver $(DESTDIR)$(SERVER_BINDIR)/uuserver -clean:: - $(RM) server.o uuserver +clean: + $(RM) client.o server.o uuclient uuserver diff --git a/src/build-tools/Makefile.in b/src/build-tools/Makefile.in index 271c002..61d4a8e 100644 --- a/src/build-tools/Makefile.in +++ b/src/build-tools/Makefile.in @@ -11,7 +11,7 @@ PKGCONFIG_FILES = \ krb5-gssapi.pc \ gssrpc.pc -all-unix:: krb5-config $(PKGCONFIG_FILES) +all-unix: krb5-config $(PKGCONFIG_FILES) krb5-config $(PKGCONFIG_FILES): $(BUILDTOP)/config.status cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/$@ @@ -25,7 +25,7 @@ mit-krb5-gssapi.pc: $(srcdir)/mit-krb5-gssapi.pc.in krb5-gssapi.pc: $(srcdir)/krb5-gssapi.pc.in gssrpc.pc: $(srcdir)/gssrpc.pc.in -install-unix:: +install-unix: $(INSTALL_SCRIPT) krb5-config $(DESTDIR)$(CLIENT_BINDIR)/krb5-config $(INSTALL_DATA) kadm-client.pc \ $(DESTDIR)$(PKGCONFIG_DIR)/kadm-client.pc @@ -43,5 +43,5 @@ install-unix:: # Test to ensure that krb5-config does not spit out things like # $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf -check-unix:: krb5-config +check-unix: krb5-config $(SHELL) $(srcdir)/t_krbconf diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in index 5a6e5fd..b51cfe2 100644 --- a/src/ccapi/common/Makefile.in +++ b/src/ccapi/common/Makefile.in @@ -26,7 +26,7 @@ OBJS= \ $(OUTPRE)cci_message.$(OBJEXT) \ $(OUTPRE)cci_stream.$(OBJEXT) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/ccapi/common/unix/Makefile.in b/src/ccapi/common/unix/Makefile.in index b2ebc90..ecacabd 100644 --- a/src/ccapi/common/unix/Makefile.in +++ b/src/ccapi/common/unix/Makefile.in @@ -5,7 +5,7 @@ STLIBOBJS= OBJS= SRCS= -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in index f265548..14e7d7b 100644 --- a/src/ccapi/lib/Makefile.in +++ b/src/ccapi/lib/Makefile.in @@ -53,7 +53,7 @@ SRCS= \ ccapi_err.c ccapi_err.h : ccapi_err.et -all-unix:: all-libobjs all-liblinks +all-unix: all-libobjs all-liblinks clean-unix:: clean-libobjs clean-liblinks clean-libs @lib_frag@ diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in index 455b6b7..ce47d65 100644 --- a/src/ccapi/lib/unix/Makefile.in +++ b/src/ccapi/lib/unix/Makefile.in @@ -5,7 +5,7 @@ LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common STLIBOBJS= stubs.o OBJS= $(OUTPRE)stubs.$(OBJEXT) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 6f3d941..4567609 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -64,7 +64,7 @@ LINK = link LIBS = ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish +all: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ @@ -110,10 +110,10 @@ finish: echo "Finished in ccapi/lib/win." cd .. -install:: +install: echo "Doing nothing for make install" -clean:: +clean: if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj if exist $(OUTPRE)*.res del $(OUTPRE)*.res diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in index 0cfa43a..2c01307 100644 --- a/src/ccapi/server/Makefile.in +++ b/src/ccapi/server/Makefile.in @@ -52,7 +52,7 @@ SRCS= \ ccs_pipe.c \ ccs_server.c -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/ccapi/server/unix/Makefile.in b/src/ccapi/server/unix/Makefile.in index 1d45a5f..b3743f0 100644 --- a/src/ccapi/server/unix/Makefile.in +++ b/src/ccapi/server/unix/Makefile.in @@ -5,7 +5,7 @@ STLIBOBJS= OBJS= SRCS= -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in index 23cec27..1c925a2 100644 --- a/src/ccapi/server/win/Makefile.in +++ b/src/ccapi/server/win/Makefile.in @@ -69,7 +69,7 @@ LIBS = ..\$(SLIB) rpcrt4.lib advapi32.lib ws2_32.lib user32.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile copysrc midl $(OUTPRE)ccapiserver.exe finish +all: Makefile copysrc midl $(OUTPRE)ccapiserver.exe finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ @@ -104,7 +104,7 @@ finish : @echo "Finished building ccapiserver.exe" cd -clean:: +clean: if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj if exist $(OUTPRE)*.res del $(OUTPRE)*.res diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in index cb53cce..85fe172 100644 --- a/src/ccapi/test/Makefile.in +++ b/src/ccapi/test/Makefile.in @@ -138,8 +138,8 @@ LIBS = -lkrb5 ##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib $(CCLIB).lib LFLAGS = /nologo $(LOPTS) -all-mac:: setup-test-dir pingtest simple_lock_test build-base build-tests link-tests copy-script success-message -all-windows:: setup-windows build-base $(OUTPRE)pingtest.exe build-tests build-testall copy-script success-message +all-mac: setup-test-dir pingtest simple_lock_test build-base build-tests link-tests copy-script success-message +all-windows: setup-windows build-base $(OUTPRE)pingtest.exe build-tests build-testall copy-script success-message # compile base files used by all tests build-base: $(PINGOBJS) @@ -219,7 +219,7 @@ success-message: .PHONY: clean -clean:: +clean: -rm -rf "$(OBJDIR)" -rm -rf $(LIBSRC) -rm -rf $(WINH) 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)'`; \ diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in index 1011c0d..0f2a0b2 100644 --- a/src/config-files/Makefile.in +++ b/src/config-files/Makefile.in @@ -1,8 +1,8 @@ mydir=config-files BUILDTOP=$(REL).. -all:: +all: -install:: +install: $(INSTALL_DATA) $(srcdir)/kdc.conf ${DESTDIR}$(EXAMPLEDIR)/kdc.conf $(INSTALL_DATA) $(srcdir)/krb5.conf ${DESTDIR}$(EXAMPLEDIR)/krb5.conf $(INSTALL_DATA) $(srcdir)/services.append ${DESTDIR}$(EXAMPLEDIR)/services.append diff --git a/src/config/lib.in b/src/config/lib.in index c041571..882e602 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -153,13 +153,13 @@ Makefile: $(top_srcdir)/config/lib.in $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf # Use the following if links need to be made to $(TOPLIBD): -# all-unix:: all-liblinks -# install-unix:: install-libs +# all-unix: all-liblinks +# install-unix: install-libs # clean-unix:: clean-liblinks clean-libs # Use the following if links need not be made: -# all-unix:: all-libs -# install-unix:: install-libs +# all-unix: all-libs +# install-unix: install-libs # clean-unix:: clean-libs ### diff --git a/src/config/libnover.in b/src/config/libnover.in index e18c19f..ab6baea 100644 --- a/src/config/libnover.in +++ b/src/config/libnover.in @@ -119,13 +119,13 @@ Makefile: $(top_srcdir)/config/libnover.in $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf # Use the following if links need to be made to $(TOPLIBD): -# all-unix:: all-liblinks -# install-unix:: install-libs +# all-unix: all-liblinks +# install-unix: install-libs # clean-unix:: clean-liblinks clean-libs # Use the following if links need not be made: -# all-unix:: all-libs -# install-unix:: install-libs +# all-unix: all-libs +# install-unix: install-libs # clean-unix:: clean-libs ### diff --git a/src/config/libobj.in b/src/config/libobj.in index aa913f0..0f7d2f5 100644 --- a/src/config/libobj.in +++ b/src/config/libobj.in @@ -36,7 +36,7 @@ Makefile: $(top_srcdir)/config/libobj.in config.status: $(top_srcdir)/config/shlib.conf # clean-unix:: clean-libobjs -# all-unix:: all-libobjs +# all-unix: all-libobjs ### ### end config/libobj.in diff --git a/src/config/post.in b/src/config/post.in index f073396..9180fd4 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -3,15 +3,15 @@ ## # in case there is no default target (very unlikely) -all:: +all: -check-windows:: +check-windows: ############################## # dependency generation # -depend:: depend-postrecurse +depend: depend-postrecurse depend-postrecurse: depend-recurse depend-recurse: depend-prerecurse @@ -121,7 +121,7 @@ DEPTARGETS_@top_srcdir@_. = $(DEP_VERIFY) # Clear out dependencies. Should only be used temporarily, e.g., while # moving or renaming headers and then rebuilding dependencies. -undepend:: undepend-postrecurse +undepend: undepend-postrecurse undepend-recurse: undepend-postrecurse: undepend-recurse if test -n "$(SRCS)" ; then \ @@ -138,14 +138,14 @@ undepend-postrecurse: undepend-recurse ############################## # Python tests -check-unix:: check-pytests-@HAVE_PYTHON@ +check-unix: check-pytests-@HAVE_PYTHON@ # Makefile.in should add rules to check-pytests to execute Python tests. -check-pytests-yes:: check-pytests -check-pytests-no:: -check-pytests:: +check-pytests-yes: check-pytests +check-pytests-no: +check-pytests: -clean:: clean-$(WHAT) +clean: clean-$(WHAT) clean-unix:: $(RM) $(OBJS) $(DEPTARGETS_CLEAN) $(EXTRA_FILES) @@ -156,7 +156,7 @@ clean-windows:: $(RM) *.$(OBJEXT) $(RM) msvc.pdb *.err -distclean:: distclean-$(WHAT) +distclean: distclean-$(WHAT) distclean-normal-clean: $(MAKE) NORECURSE=true clean diff --git a/src/config/pre.in b/src/config/pre.in index e74a897..ba0d1fc 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -20,17 +20,17 @@ WHAT = unix SHELL=/bin/sh -all:: all-$(WHAT) +all: all-$(WHAT) -clean:: clean-$(WHAT) +clean: clean-$(WHAT) -distclean:: distclean-$(WHAT) +distclean: distclean-$(WHAT) -install:: install-$(WHAT) +install: install-$(WHAT) -check:: check-$(WHAT) +check: check-$(WHAT) -install-headers:: install-headers-$(WHAT) +install-headers: install-headers-$(WHAT) ############################## # Recursion rule support @@ -60,16 +60,16 @@ install-headers:: install-headers-$(WHAT) # double-colon rules. # # e.g. -# all:: includes foo +# all: includes foo # foo: # echo foo -# includes:: +# includes: # echo bar -# includes:: +# includes: # echo baz # # will result in "bar", "foo", "baz" on AIX, and possibly others. -all-unix:: all-postrecurse +all-unix: all-postrecurse all-postrecurse: all-recurse all-recurse: all-prerecurse @@ -90,21 +90,21 @@ distclean-recurse: distclean-prerecurse distclean-prerecurse: distclean-postrecurse: -install-unix:: install-postrecurse +install-unix: install-postrecurse install-postrecurse: install-recurse install-recurse: install-prerecurse install-prerecurse: install-postrecurse: -install-headers-unix:: install-headers-postrecurse +install-headers-unix: install-headers-postrecurse install-headers-postrecurse: install-headers-recurse install-headers-recurse: install-headers-prerecurse install-headers-prerecurse: install-headers-postrecurse: -check-unix:: check-postrecurse +check-unix: check-postrecurse check-postrecurse: check-recurse check-recurse: check-prerecurse diff --git a/src/config/win-post.in b/src/config/win-post.in index e7164ff..6535c1b 100644 --- a/src/config/win-post.in +++ b/src/config/win-post.in @@ -2,20 +2,20 @@ # Start of Win32 post-config lines (config/win-post.in) # -setup-msg:: +setup-msg: @set C_RULE_PRINT= $(C_RULE_PRINT) @set DO_C_RULE_PRINT=1 !if defined(NO_OUTPRE) || defined(NO_OUTDIR) -outpre-dir:: +outpre-dir: !else -outpre-dir:: $(OUTPRE3)$(DIRNUL) +outpre-dir: $(OUTPRE3)$(DIRNUL) !endif # -# put all:: first just in case no other rules occur here +# put all: first just in case no other rules occur here # -all:: +all: # # Set the #define to indicate that we are compiling a DLL. We default to @@ -46,19 +46,19 @@ all-recurse: @for %d in ($(WINSUBDIRS)) do @(echo Making in $(mydir)\%d && \ pushd %d && $(MAKE) -$(MFLAGS) && popd) || exit 1 @echo Making in $(mydir) -all-windows:: all-recurse +all-windows: all-recurse -clean-recurse:: +clean-recurse: @for %d in ($(WINSUBDIRS)) do @(echo Making clean in $(mydir)\%d && \ pushd %d && $(MAKE) -$(MFLAGS) clean && popd) || exit 1 @echo Making clean in $(mydir) clean-windows:: clean-recurse -check-recurse:: +check-recurse: @for %d in ($(WINSUBDIRS)) do @(echo Making check in $(mydir)\%d && \ pushd %d && $(MAKE) -$(MFLAGS) check && popd) || exit 1 @echo Making check in $(mydir) -check-windows:: check-recurse +check-windows: check-recurse !endif # WINSUBDIRS @@ -82,7 +82,7 @@ OBJFILELIST=@$(OBJFILE) OBJFILEDEP=$(OBJFILE) !endif -all-windows:: $(LIBNAME) +all-windows: $(LIBNAME) $(LIBNAME): $(OBJFILEDEP) $(LIBCMD) /out:$(LIBNAME) /nologo $(OBJFILELIST) @@ -91,7 +91,7 @@ $(LIBNAME): $(OBJFILEDEP) # Build an object file list if OBJFILE is defined. !if defined(OBJFILE) -all-windows:: $(OBJFILE) +all-windows: $(OBJFILE) !if defined(LIBOBJS) $(OBJFILE): $(LIBOBJS) if exist $(OBJFILE) del $(OBJFILE) @@ -104,15 +104,15 @@ $(OBJFILE): $(LIBOBJS) !endif # OBJFILE -check:: -check-windows:: +check: +check-windows: clean-windows:: clean-windows-files clean-windows-dir # This needs to be in the post because we need RM to be defined in terms # of BUILDTOP -clean-windows-files:: +clean-windows-files: !if "$(OUTPRE3)" == "" !error ASSERTION FAILURE: OUTPRE3 must be defined!!! !endif diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 6084f65..bb4cc3d 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -1,18 +1,18 @@ WHAT=windows -all:: setup-msg outpre-dir +all: setup-msg outpre-dir -all:: all-$(WHAT) -clean:: clean-$(WHAT) -install:: install-$(WHAT) -check:: check-$(WHAT) +all: all-$(WHAT) +clean: clean-$(WHAT) +install: install-$(WHAT) +check: check-$(WHAT) -all-windows:: +all-windows: clean-windows:: -install-windows:: -check-windows:: +install-windows: +check-windows: -all-windows:: Makefile +all-windows: Makefile clean-windows:: Makefile # @@ -65,7 +65,7 @@ $(OUTPRE3)$(DIRNUL): @if exist $(OUTPRE2)$(DIRNUL) if not exist $(OUTPRE3)$(DIRNUL) echo The directory $(OUTPRE3) could not be created. -clean-windows-dir:: +clean-windows-dir: -@if exist $(OUTPRE3)$(DIRNUL) rmdir $(OUTPRE3) -@if exist $(OUTPRE2)$(DIRNUL) rmdir $(OUTPRE2) -@if exist $(OUTPRE1)$(DIRNUL) rmdir $(OUTPRE1) diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index 0963a8f..1f9c257 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -128,7 +128,7 @@ $(docsrc)/version.py: $(top_srcdir)/patchlevel.h $(srcdir)/version.py.in rm -f $@ $(CC) -E -I$(top_srcdir) - < $(srcdir)/version.py.in > $@ -clean:: +clean: rm -rf doxy rst_apiref rst_composite rst_notice html_subst \ Doxyfile paths.py $(docsrc)/version.py notice.txt \ $(docsrc)/html/.doctrees $(docsrc)/pdf/.doctrees \ diff --git a/src/include/Makefile.in b/src/include/Makefile.in index cb4b44b..95f0bca 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -4,9 +4,9 @@ KRB5RCTMPDIR= @KRB5_RCTMPDIR@ ##DOSBUILDTOP = .. NO_OUTPRE=1 -all-unix:: krb5/krb5.h +all-unix: krb5/krb5.h -all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@ +all-unix: maybe-make-db.h-@DB_HEADER_VERSION@ generate-files-mac: krb5/krb5.h @@ -27,10 +27,10 @@ K5_ET_HEADERS = \ ../lib/krb5/error_tables/asn1_err.h BUILT_HEADERS = osconf.h -all-unix:: autoconf.h $(BUILT_HEADERS) -all-windows:: autoconf.h $(BUILT_HEADERS) verify-calling-conventions-krb5 +all-unix: autoconf.h $(BUILT_HEADERS) +all-windows: autoconf.h $(BUILT_HEADERS) verify-calling-conventions-krb5 -all-unix:: @MAINT@ verify-calling-conventions-krb5 +all-unix: @MAINT@ verify-calling-conventions-krb5 $(srcdir)/autoconf.h.in: @MAINT@ $(srcdir)/autoconf.stmp $(srcdir)/autoconf.stmp: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 @@ -130,13 +130,13 @@ clean-windows:: $(RM) osconf.h autoconf.h autoconf.stamp @echo Making clean in include -clean:: +clean: $(RM) osconf.new $(BUILT_HEADERS) -distclean:: +distclean: $(RM) autoconf.h -install-headers-unix install:: krb5/krb5.h profile.h +install-headers-unix install: krb5/krb5.h profile.h $(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h $(INSTALL_DATA) $(srcdir)/kdb.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb.h $(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h @@ -154,4 +154,4 @@ install-headers-unix install:: krb5/krb5.h profile.h $(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h $(INSTALL_DATA) $(srcdir)/krad.h $(DESTDIR)$(KRB5_INCDIR)/krad.h -depend:: krb5/krb5.h $(BUILT_HEADERS) +depend: krb5/krb5.h $(BUILT_HEADERS) diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index e39ead2..f4061f4 100644 --- a/src/kadmin/Makefile.in +++ b/src/kadmin/Makefile.in @@ -2,5 +2,5 @@ mydir=kadmin BUILDTOP=$(REL).. SUBDIRS = cli dbutil ktutil server testing -all:: +all: diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 789c597..adfea6e 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -11,7 +11,7 @@ SRCS = kadmin.c kadmin_ct.c ss_wrapper.c getdate.c keytab.c keytab_local.c LOCALINCLUDES=-I$(srcdir) -all:: $(PROG).local $(PROG) +all: $(PROG).local $(PROG) $(PROG).local: $(LOCAL_OBJS) $(SS_DEPLIB) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $(PROG).local $(LOCAL_OBJS) $(SS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) @@ -21,14 +21,14 @@ $(PROG): $(KADMIN_OBJS) $(SS_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) kadmin_ct.o: kadmin_ct.c -install:: +install: $(INSTALL_PROGRAM) $(PROG).local ${DESTDIR}$(ADMIN_BINDIR)/$(PROG).local $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(CLIENT_BINDIR)/$(PROG) $(INSTALL_SCRIPT) $(srcdir)/k5srvutil.sh ${DESTDIR}$(CLIENT_BINDIR)/k5srvutil generate-files-mac: kadmin_ct.c getdate.c -clean:: +clean: $(RM) $(PROG).local $(PROG) $(COMMON_OBJS) $(KADMIN_OBJS) $(LOCAL_OBJS) clean-unix:: $(RM) datetest getdate.c kadmin_ct.c diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index ceaf793..7a2bbc3 100644 --- a/src/kadmin/dbutil/Makefile.in +++ b/src/kadmin/dbutil/Makefile.in @@ -15,7 +15,7 @@ OBJS = kdb5_util.o kdb5_create.o kadm5_create.o kdb5_destroy.o \ GETDATE = ../cli/getdate.o -all:: $(PROG) +all: $(PROG) $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(GETDATE) $(CC_LINK) -o $(PROG) $(OBJS) $(GETDATE) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) @@ -24,10 +24,10 @@ import_err.c import_err.h: $(srcdir)/import_err.et $(OBJS): import_err.h -install:: +install: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) -clean:: +clean: $(RM) $(PROG) $(OBJS) import_err.c import_err.h T_TDUMPUTIL_OBJS = t_tdumputil.o tdumputil.o @@ -35,7 +35,7 @@ T_TDUMPUTIL_OBJS = t_tdumputil.o tdumputil.o t_tdumputil: $(T_TDUMPUTIL_OBJS) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ $(T_TDUMPUTIL_OBJS) $(SUPPORT_LIB) -depend:: import_err.h +depend: import_err.h -check-pytests:: t_tdumputil +check-pytests: t_tdumputil $(RUNPYTEST) $(srcdir)/t_tdumputil.py $(PYTESTFLAGS) diff --git a/src/kadmin/kdbkeys/Makefile.in b/src/kadmin/kdbkeys/Makefile.in index 37a7614..996febd 100644 --- a/src/kadmin/kdbkeys/Makefile.in +++ b/src/kadmin/kdbkeys/Makefile.in @@ -4,13 +4,13 @@ BUILDTOP=$(REL)..$(S).. PROG = kdbkeys OBJS = kdbkeys.o -all:: $(PROG) +all: $(PROG) $(PROG): $(OBJS) $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS) -install:: +install: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) -clean:: +clean: $(RM) $(PROG) $(OBJS) diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index e92f84f..f8f9b41 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -9,12 +9,12 @@ SRCS= $(srcdir)/ktutil.c \ ktutil_ct.c \ $(srcdir)/ktutil_funcs.c -all:: ktutil +all: ktutil ktutil: ktutil.o $(OBJS) $(SS_DEPLIB) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o ktutil $(OBJS) $(SS_LIB) $(KRB5_BASE_LIBS) -install:: +install: $(INSTALL_PROGRAM) ktutil ${DESTDIR}$(CLIENT_BINDIR)/ktutil generate-files-mac: ktutil_ct.c @@ -24,10 +24,7 @@ ktutil_ct.c: ktutil_ct.ct ktutil_ct.o: ktutil_ct.c -clean:: - $(RM) ktutil_ct.c +clean: + $(RM) ktutil_ct.c ktutil -depend:: ktutil_ct.c - -clean:: - $(RM) ktutil +depend: ktutil_ct.c diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 3218307..3a013a4 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -10,13 +10,13 @@ PROG = kadmind OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o ipropd_svc.o SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c -all:: $(PROG) +all: $(PROG) $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB) $(VERTO_DEPLIB) $(CC_LINK) -o $(PROG) $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) $(VERTO_LIBS) -install:: +install: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(SERVER_BINDIR)/$(PROG) -clean:: +clean: $(RM) $(PROG) $(OBJS) diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index 0681e8e..e5bcc74 100644 --- a/src/kadmin/testing/Makefile.in +++ b/src/kadmin/testing/Makefile.in @@ -2,7 +2,7 @@ mydir=kadmin$(S)testing BUILDTOP=$(REL)..$(S).. SUBDIRS = scripts util -all:: +all: -clean:: +clean: -$(RM) -r krb5-test-root admin_* init-* kadmin_* kdc_rcache.* ovsec-* diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in index 1e14d61..ebda77e 100644 --- a/src/kadmin/testing/scripts/Makefile.in +++ b/src/kadmin/testing/scripts/Makefile.in @@ -7,7 +7,7 @@ PERL_PATH=@PERL_PATH@ GEN_SCRIPTS = compare_dump.pl make-host-keytab.pl \ simple_dump.pl verify_xrunner_report.pl qualname.pl -all:: env-setup.sh $(GEN_SCRIPTS) +all: env-setup.sh $(GEN_SCRIPTS) # Should only rebuild env_setup.sh here (use CONFIG_FILES=), but the weird krb5 # makefile post-processing is unconditional and would trash the makefile. @@ -27,5 +27,5 @@ env-setup.stamp: $(srcdir)/env-setup.shin $(BUILDTOP)/config.status \ chmod +x $@.tmp mv $@.tmp $@ -clean:: +clean: -rm -f $(GEN_SCRIPTS) *.tmp env-setup.sh env-setup.stamp diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index 3d60177..7785c74 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -17,15 +17,15 @@ SRVPROG = kadm5_srv_tcl DO_ALL=@DO_ALL@ -all:: all-$(DO_ALL) +all: all-$(DO_ALL) -all-:: +all-: @echo "+++" @echo "+++ WARNING: Tcl not available. The kadm5 tests will not be run." @echo "+++" @echo 'Skipped kadm5 tests: Tcl not found' >> $(SKIPTESTS) -all-tcl:: $(CLNTPROG) $(SRVPROG) +all-tcl: $(CLNTPROG) $(SRVPROG) $(SRVPROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $(SRVPROG) $(OBJS) $(TCL_MAYBE_RPATH) \ @@ -38,5 +38,5 @@ $(CLNTPROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) bsddb_dump: bsddb_dump.o $(CC_LINK) -o bsddb_dump bsddb_dump.o $(KADMSRV_LIBS) -clean:: +clean: $(RM) $(CLNTPROG) $(SRVPROG) diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index f0f2d5a..3a69873 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -2,7 +2,7 @@ mydir=kdc BUILDTOP=$(REL).. DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -all:: krb5kdc rtest +all: krb5kdc rtest # DEFINES = -DBACKWARD_COMPAT $(KRB4DEF) @@ -54,7 +54,7 @@ OBJS= \ RT_OBJS= rtest.o \ kdc_transit.o -depend:: kdc5_err.c kdc5_err.h +depend: kdc5_err.c kdc5_err.h kdc5_err.c: kdc5_err.et @@ -68,18 +68,18 @@ krb5kdc: $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB) $(VE rtest: $(RT_OBJS) $(KDB5_DEPLIBS) $(KADM_COMM_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o rtest $(RT_OBJS) $(KDB5_LIBS) $(KADM_COMM_LIBS) $(KRB5_BASE_LIBS) -check-unix:: rtest +check-unix: rtest $(RUN_TEST) $(srcdir)/rtscript > test.out cmp test.out $(srcdir)/rtest.good $(RM) test.out -check-pytests:: +check-pytests: $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) -install:: +install: $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc -clean:: +clean: $(RM) kdc5_err.h kdc5_err.c krb5kdc rtest.o rtest diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 8fbc50a..8a119ab 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -3,7 +3,7 @@ SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils krad WINSUBDIRS=crypto krb5 gssapi BUILDTOP=$(REL).. -all-unix:: +all-unix: CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libkadm.a \ libcom_err.a libpty.a ibss.a libgssapi.a libapputils.a libkrb5.so \ @@ -145,5 +145,5 @@ clean-windows:: ##WIN32##gssapi.lib: $(GLIB) ##WIN32##profile.lib: $(PLIB) -##WIN32##all-windows:: all-recurse lib-windows -##WIN32##lib-windows:: krb5.lib gssapi.lib profile.lib +##WIN32##all-windows: all-recurse lib-windows +##WIN32##lib-windows: krb5.lib gssapi.lib profile.lib diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 686a0ee..93e3d87 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -15,9 +15,9 @@ SED = sed STLIBOBJS=net-server.o udppktinfo.o @LIBOBJS@ LIBBASE=apputils -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= daemon.c diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index a036022..c3fcfd7 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -37,12 +37,12 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ ##DOS##OBJFILEDEP=$(OUTPRE)krb.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst ##DOS##OBJFILELIST=@$(OUTPRE)krb.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs -# all-unix:: -# install-unix:: +# all-unix: +# install-unix: libcrypto.lib: libdir crypto.lib diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in index 06312fa..baf5d97 100644 --- a/src/lib/crypto/builtin/Makefile.in +++ b/src/lib/crypto/builtin/Makefile.in @@ -39,10 +39,10 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs -includes:: depend +all-unix: all-libobjs +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in index 064e44d..915994b 100644 --- a/src/lib/crypto/builtin/aes/Makefile.in +++ b/src/lib/crypto/builtin/aes/Makefile.in @@ -32,7 +32,7 @@ GEN_OBJS=\ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs # aes-gen +all-unix: all-libobjs # aes-gen iaesx64@SHOBJEXT@: $(srcdir)/iaesx64.s $(YASM) $(AESNI_FLAGS) -o $@ $(srcdir)/iaesx64.s @@ -40,9 +40,9 @@ iaesx64@SHOBJEXT@: $(srcdir)/iaesx64.s iaesx86@SHOBJEXT@: $(srcdir)/iaesx86.s $(YASM) $(AESNI_FLAGS) -o $@ $(srcdir)/iaesx86.s -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) aes-gen: aes-gen.o $(GEN_OBJS) $(CC_LINK) -o aes-gen aes-gen.o $(GEN_OBJS) @@ -50,12 +50,12 @@ aes-gen: aes-gen.o $(GEN_OBJS) run-aes-gen: aes-gen ./aes-gen > kresults.out -check:: run-aes-gen +check: run-aes-gen clean-unix:: clean-libobjs -clean:: +clean: -$(RM) aes-gen aes-gen.o kresults.out @libobj_frag@ diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in index a15c6f9..5d3b14c 100644 --- a/src/lib/crypto/builtin/camellia/Makefile.in +++ b/src/lib/crypto/builtin/camellia/Makefile.in @@ -18,11 +18,11 @@ GEN_OBJS= $(OUTPRE)camellia.$(OBJEXT) ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs # camellia-gen +all-unix: all-libobjs # camellia-gen -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) camellia-gen: camellia-gen.o $(GEN_OBJS) $(CC_LINK) -o camellia-gen camellia-gen.o $(GEN_OBJS) @@ -30,12 +30,12 @@ camellia-gen: camellia-gen.o $(GEN_OBJS) run-camellia-gen: camellia-gen ./camellia-gen > kresults.out -check:: run-camellia-gen +check: run-camellia-gen clean-unix:: clean-libobjs -clean:: +clean: -$(RM) camellia-gen camellia-gen.o kresults.out @libobj_frag@ diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in index 02255dd..ed25dab 100644 --- a/src/lib/crypto/builtin/des/Makefile.in +++ b/src/lib/crypto/builtin/des/Makefile.in @@ -56,21 +56,21 @@ verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) $(SUPPORT_LIB) -all-unix:: all-libobjs +all-unix: all-libobjs -check-unix:: verify destest +check-unix: verify destest $(RUN_TEST) ./verify -z $(RUN_TEST) ./verify -m $(RUN_TEST) ./verify $(RUN_TEST) ./destest < $(srcdir)/keytest.data -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) -check-windows:: +check-windows: -clean:: +clean: $(RM) destest.$(OBJEXT) destest$(EXEEXT) verify$(EXEEXT) \ t_verify.$(OBJEXT) $(TOBJS) diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in index c87fb05..4fd3311 100644 --- a/src/lib/crypto/builtin/enc_provider/Makefile.in +++ b/src/lib/crypto/builtin/enc_provider/Makefile.in @@ -33,11 +33,11 @@ SRCS= \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in index 37d88d4..c665d6c 100644 --- a/src/lib/crypto/builtin/hash_provider/Makefile.in +++ b/src/lib/crypto/builtin/hash_provider/Makefile.in @@ -25,11 +25,11 @@ SRCS= $(srcdir)/hash_crc32.c \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in index d93f78f..9eb5965 100644 --- a/src/lib/crypto/builtin/md4/Makefile.in +++ b/src/lib/crypto/builtin/md4/Makefile.in @@ -14,18 +14,18 @@ SRCS= $(srcdir)/md4.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) -check-unix:: +check-unix: -check-windows:: +check-windows: -clean:: +clean: clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in index c938da8..e8778f3 100644 --- a/src/lib/crypto/builtin/md5/Makefile.in +++ b/src/lib/crypto/builtin/md5/Makefile.in @@ -13,17 +13,17 @@ SRCS= $(srcdir)/md5.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) -check-unix:: +check-unix: -check-windows:: +check-windows: -clean:: +clean: clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in index 3f913ca..5895c36 100644 --- a/src/lib/crypto/builtin/sha1/Makefile.in +++ b/src/lib/crypto/builtin/sha1/Makefile.in @@ -13,11 +13,11 @@ SRCS= $(srcdir)/shs.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) t_shs: t_shs.o shs.o $(SUPPORT_DEPLIB) $(CC_LINK) -o t_shs t_shs.o shs.o $(SUPPORT_LIB) @@ -27,15 +27,15 @@ $(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB) $(CC_LINK) -o t_shs3 t_shs3.o shs.o $(SUPPORT_LIB) -check-unix:: t_shs t_shs3 +check-unix: t_shs t_shs3 $(RUN_TEST) $(C)t_shs -x $(RUN_TEST) $(C)t_shs3 -check-windows:: $(OUTPRE)t_shs.exe $(OUTPRE)t_shs3.exe +check-windows: $(OUTPRE)t_shs.exe $(OUTPRE)t_shs3.exe $(OUTPRE)$(C)t_shs.exe -x $(OUTPRE)$(C)t_shs3.exe -clean:: +clean: $(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT) t_shs3$(EXEEXT) t_shs3.$(OBJEXT) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in index a13f02e..d4a8ac7 100644 --- a/src/lib/crypto/builtin/sha2/Makefile.in +++ b/src/lib/crypto/builtin/sha2/Makefile.in @@ -13,11 +13,11 @@ SRCS= $(srcdir)/sha256.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) t_sha256: t_sha256.o sha256.o $(SUPPORT_DEPLIB) $(CC_LINK) -o t_sha256 t_sha256.o sha256.o $(SUPPORT_LIB) @@ -27,10 +27,10 @@ $(OUTPRE)t_sha256.exe: $(OUTPRE)t_sha256.obj $(OUTPRE)sha256.obj link -out:$@ $** -check-unix:: t_sha256 +check-unix: t_sha256 $(RUN_TEST) $(C)t_sha256 -clean:: +clean: $(RM) t_sha256$(EXEEXT) t_sha256.$(OBJEXT) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in index f80c9a0..f4914d4 100644 --- a/src/lib/crypto/crypto_tests/Makefile.in +++ b/src/lib/crypto/crypto_tests/Makefile.in @@ -32,7 +32,7 @@ EXTRADEPSRCS=\ # NOTE: The t_cksum known checksum values are primarily for regression # testing. They are not derived a priori, but are known to produce # checksums that interoperate. -check-unix:: t_nfold t_encrypt t_decrypt t_prf t_prng t_cmac t_hmac \ +check-unix: t_nfold t_encrypt t_decrypt t_prf t_prng t_cmac t_hmac \ t_cksum4 t_cksum5 t_cksums \ aes-test \ camellia-test \ @@ -154,7 +154,7 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(KRB5_BASE_DEPLIBS) t_combine$(EXEEXT): t_combine.$(OBJEXT) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ t_combine.$(OBJEXT) $(KRB5_BASE_LIBS) -clean:: +clean: $(RM) t_nfold.o t_nfold t_encrypt t_encrypt.o \ t_decrypt.o t_decrypt t_prng.o t_prng t_cmac.o t_cmac \ t_hmac.o t_hmac t_pkcs5.o t_pkcs5 pbkdf2.o t_prf t_prf.o \ diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in index 47d1b4a..7b59839 100644 --- a/src/lib/crypto/krb/Makefile.in +++ b/src/lib/crypto/krb/Makefile.in @@ -196,12 +196,12 @@ SRCS=\ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs -includes:: depend +all-unix: all-libobjs +includes: depend -depend:: $(SRCS) +depend: $(SRCS) -check-unix:: t_fortuna +check-unix: t_fortuna if [ $(PRNG_ALG) = fortuna ]; then \ $(RUN_TEST) ./t_fortuna > t_fortuna.output; \ cmp t_fortuna.output $(srcdir)/t_fortuna.expected; \ diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in index 8014639..aa434b1 100644 --- a/src/lib/crypto/openssl/Makefile.in +++ b/src/lib/crypto/openssl/Makefile.in @@ -37,10 +37,10 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \ hash_provider/OBJS.ST \ aes/OBJS.ST -all-unix:: all-libobjs -includes:: depend +all-unix: all-libobjs +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/openssl/aes/Makefile.in b/src/lib/crypto/openssl/aes/Makefile.in index 4b56e6b..feaaba9 100644 --- a/src/lib/crypto/openssl/aes/Makefile.in +++ b/src/lib/crypto/openssl/aes/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)aes BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in index 15406f1..83930f6 100644 --- a/src/lib/crypto/openssl/camellia/Makefile.in +++ b/src/lib/crypto/openssl/camellia/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)camellia BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/des/Makefile.in b/src/lib/crypto/openssl/des/Makefile.in index 6240a57..4392fb8 100644 --- a/src/lib/crypto/openssl/des/Makefile.in +++ b/src/lib/crypto/openssl/des/Makefile.in @@ -8,11 +8,11 @@ OBJS= $(OUTPRE)des_keys.$(OBJEXT) SRCS= $(srcdir)/des_keys.c -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/openssl/enc_provider/Makefile.in b/src/lib/crypto/openssl/enc_provider/Makefile.in index 89a02af..b9e28c9 100644 --- a/src/lib/crypto/openssl/enc_provider/Makefile.in +++ b/src/lib/crypto/openssl/enc_provider/Makefile.in @@ -23,11 +23,11 @@ SRCS= \ $(srcdir)/camellia.c \ $(srcdir)/rc4.c -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/openssl/hash_provider/Makefile.in b/src/lib/crypto/openssl/hash_provider/Makefile.in index 6471371..993c9c3 100644 --- a/src/lib/crypto/openssl/hash_provider/Makefile.in +++ b/src/lib/crypto/openssl/hash_provider/Makefile.in @@ -18,11 +18,11 @@ SRCS= $(srcdir)/hash_crc32.c \ $(srcdir)/hash_md5.c \ $(srcdir)/hash_sha1.c -all-unix:: all-libobjs +all-unix: all-libobjs -includes:: depend +includes: depend -depend:: $(SRCS) +depend: $(SRCS) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in index 69438f6..c6c6ea0 100644 --- a/src/lib/crypto/openssl/md4/Makefile.in +++ b/src/lib/crypto/openssl/md4/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)md4 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in index cab3c60..38a289c 100644 --- a/src/lib/crypto/openssl/md5/Makefile.in +++ b/src/lib/crypto/openssl/md5/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)md5 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in index 69a03d5..49142e8 100644 --- a/src/lib/crypto/openssl/sha1/Makefile.in +++ b/src/lib/crypto/openssl/sha1/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)sha1 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in index 4b56e6b..feaaba9 100644 --- a/src/lib/crypto/openssl/sha2/Makefile.in +++ b/src/lib/crypto/openssl/sha2/Makefile.in @@ -1,6 +1,6 @@ # Placeholder since all crypto modules must have the same structure. mydir=lib$(S)crypto$(S)openssl$(S)aes BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 8d204b5..1e8db4e 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -30,9 +30,9 @@ SHLIB_EXPDEPS=\ SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS) RELDIR=gssapi -all-unix:: all-liblinks @MAINT@ verify-calling-conventions-gssapi +all-unix: all-liblinks @MAINT@ verify-calling-conventions-gssapi -install-unix:: install-libs +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs clean-misc-unix diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 9f8f0b4..a9e8948 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -108,8 +108,8 @@ EXPORTED_BUILT_HEADERS= gssapi.h $(OBJS): $(EXPORTED_HEADERS) $(ETHDRS) -all-unix:: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS) -all-unix:: all-libobjs +all-unix: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS) +all-unix: all-libobjs errmap.h: $(top_srcdir)/util/gen.pl $(top_srcdir)/util/t_array.pm \ $(top_srcdir)/util/t_bimap.pm @@ -131,8 +131,8 @@ maptest: maptest.o ##DOS##LIBOBJS = $(OBJS) -all-windows:: win-create-ehdrdir -all-windows:: $(HDRS) +all-windows: win-create-ehdrdir +all-windows: $(HDRS) win-create-ehdrdir: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) @@ -150,13 +150,13 @@ t_seqstate: t_seqstate.o util_seqstate.o $(SUPPORT_DEPLIB) $(CC_LINK) $(ALL_CFLAGS) -o $@ t_seqstate.o util_seqstate.o \ $(SUPPORT_LIB) -check-unix:: t_seqstate +check-unix: t_seqstate $(RUN_TEST) ./t_seqstate generate-files-mac: gssapi.h errmap.h # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5) -install-headers-unix install:: gssapi.h +install-headers-unix install: gssapi.h @set -x; for f in $(EXPORTED_HEADERS) ; \ do $(INSTALL_DATA) $(srcdir)/$$f \ $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \ @@ -166,7 +166,7 @@ install-headers-unix install:: gssapi.h $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \ done -depend:: $(ETSRCS) $(ETHDRS) $(HDRS) errmap.h maptest.h +depend: $(ETSRCS) $(ETHDRS) $(HDRS) errmap.h maptest.h @libobj_frag@ diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 7573651..364a7a4 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -203,7 +203,7 @@ EXPORTED_HEADERS= gssapi_krb5.h GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h -all-windows:: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS) +all-windows: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS) ##DOS##$(EHDRDIR): ##DOS## mkdir $(EHDRDIR) @@ -215,8 +215,8 @@ $(GSSAPI_KRB5_HDR): $(srcdir)$(S)gssapi_krb5.h @$(MK_EHDRDIR) $(CP) $(srcdir)$(S)gssapi_krb5.h "$@" -all-unix:: $(SRCS) $(HDRS) $(GSSAPI_KRB5_HDR) -all-unix:: all-libobjs +all-unix: $(SRCS) $(HDRS) $(GSSAPI_KRB5_HDR) +all-unix: all-libobjs error_map.h: $(top_srcdir)/util/gen-map.pl \ $(top_srcdir)/util/ktemplate.pm Makefile @@ -245,15 +245,15 @@ clean-windows:: generate-files-mac: error_map.h -install-headers-unix install:: +install-headers-unix install: @set -x; for f in $(EXPORTED_HEADERS) ; \ do $(INSTALL_DATA) $(srcdir)/$$f \ $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \ done -depend:: $(ETSRCS) $(ETHDRS) $(GSSAPI_KRB5_HDR) error_map.h +depend: $(ETSRCS) $(ETHDRS) $(GSSAPI_KRB5_HDR) error_map.h -install:: +install: @libobj_frag@ diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in index b85b21d..5e1ed6d 100644 --- a/src/lib/gssapi/mechglue/Makefile.in +++ b/src/lib/gssapi/mechglue/Makefile.in @@ -206,19 +206,19 @@ EXPORTED_HEADERS = mechglue.h $(OBJS): $(EXPORTED_HEADERS) -all-unix:: all-libobjs +all-unix: all-libobjs ##DOS##LIBOBJS = $(OBJS) clean-unix:: clean-libobjs # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5) -install:: +install: @set -x; for f in $(EXPORTED_HEADERS) ; \ do $(INSTALL_DATA) $(srcdir)$(S)$$f \ $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi$(S)$$f ; \ done -includes:: +includes: @libobj_frag@ diff --git a/src/lib/gssapi/spnego/Makefile.in b/src/lib/gssapi/spnego/Makefile.in index f323d91..c21ea23 100644 --- a/src/lib/gssapi/spnego/Makefile.in +++ b/src/lib/gssapi/spnego/Makefile.in @@ -15,7 +15,7 @@ OBJS = $(OUTPRE)spnego_mech.$(OBJEXT) STLIBOBJS = spnego_mech.o -all-unix:: all-libobjs +all-unix: all-libobjs ##DOS##LIBOBJS = $(OBJS) diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 24e1381..a2694bb 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -10,7 +10,7 @@ chpass_util_strings.$(OBJEXT): chpass_util_strings.c kadm_err.c kadm_err.h: $(srcdir)/kadm_err.et chpass_util_strings.c chpass_util_strings.h: $(srcdir)/chpass_util_strings.et -clean:: +clean: $(RM) kadm_err.c kadm_err.h kadm_err.o $(RM) chpass_util_strings.c chpass_util_strings.h chpass_util_strings.o @@ -57,7 +57,7 @@ SRC_HDRS = admin.h admin_internal.h admin_xdr.h kadm_rpc.h \ $(HDRS): includes -includes:: $(SRC_HDRS) $(BUILD_HDRS) +includes: $(SRC_HDRS) $(BUILD_HDRS) if [ -d $(HDRDIR) ]; then :; else mkdir -p $(HDRDIR); fi for i in $(SRC_HDRS) ; do \ i=`basename $$i`; \ @@ -82,22 +82,22 @@ clean-unix:: all-prerecurse: includes all-prerecurse: all-libobjs -all-windows:: $(OBJS) +all-windows: $(OBJS) generate-files-mac-prerecurse: includes -check-windows:: +check-windows: clean-unix:: clean-libobjs clean-windows:: -install-headers-unix install:: $(BUILD_HDRS) +install-headers-unix install: $(BUILD_HDRS) $(INSTALL_DATA) $(srcdir)/admin.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)admin.h $(INSTALL_DATA) chpass_util_strings.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)chpass_util_strings.h $(INSTALL_DATA) kadm_err.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)kadm_err.h -depend:: includes +depend: includes @libobj_frag@ diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 1c83ee0..a180e85 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -41,13 +41,13 @@ STLIBOBJS = \ clnt_privs.o \ clnt_chpass_util.o -all-unix:: includes -all-unix:: all-liblinks -all-windows:: $(OBJS) +all-unix: includes +all-unix: all-liblinks +all-windows: $(OBJS) generate-files-mac: includes darwin.exports -includes:: client_internal.h +includes: client_internal.h if cmp $(srcdir)/client_internal.h \ $(BUILDTOP)/include/kadm5/client_internal.h >/dev/null 2>&1; then :; \ else \ @@ -59,20 +59,20 @@ includes:: client_internal.h clean-unix:: $(RM) $(BUILDTOP)/include/kadm5/client_internal.h -check-windows:: +check-windows: clean-windows:: clean-unix:: clean-liblinks clean-libs clean-libobjs -install:: install-libs +install: install-libs -install-unix:: +install-unix: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt$(DEPLIBEXT) (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ libkadm5clnt$(DEPLIBEXT)) -depend:: includes +depend: includes @lib_frag@ @libobj_frag@ diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 6aa7d10..f4b5b5b 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -73,13 +73,13 @@ STLIBOBJS = \ svr_chpass_util.o \ adb_xdr.o -all-unix:: includes -all-unix:: all-liblinks -all-windows:: $(OBJS) +all-unix: includes +all-unix: all-liblinks +all-windows: $(OBJS) generate-files-mac: includes darwin.exports -includes:: server_acl.h +includes: server_acl.h if cmp $(srcdir)/server_acl.h \ $(BUILDTOP)/include/kadm5/server_acl.h >/dev/null 2>&1; then :; \ else \ @@ -91,20 +91,20 @@ includes:: server_acl.h clean-unix:: $(RM) $(BUILDTOP)/include/kadm5/server_acl.h -check-windows:: +check-windows: clean-windows:: clean-unix:: clean-liblinks clean-libs clean-libobjs -install:: install-libs +install: install-libs -install-unix:: +install-unix: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv$(DEPLIBEXT) (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ libkadm5srv$(DEPLIBEXT)) -depend:: includes +depend: includes @lib_frag@ @libobj_frag@ diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 3a2b83f..ebf31fc 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -60,15 +60,15 @@ server-setkey-test: setkey-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) # The unit-test targets # -check:: check-@DO_TEST@ +check: check-@DO_TEST@ -check-:: +check-: @echo "+++" @echo "+++ WARNING: lib/kadm5 unit tests not run." @echo "+++ Either tcl, runtest, or Perl is unavailable." @echo "+++" -check-ok unit-test:: unit-test-client unit-test-server +check-ok unit-test: unit-test-client unit-test-server unit-test-client: unit-test-client-setup unit-test-client-body \ unit-test-client-cleanup @@ -76,13 +76,13 @@ unit-test-client: unit-test-client-setup unit-test-client-body \ unit-test-server: unit-test-server-setup unit-test-server-body \ unit-test-server-cleanup -test-randkey:: randkey-test +test-randkey: randkey-test $(ENV_SETUP) $(VALGRIND) ./randkey-test -test-handle-server:: server-handle-test +test-handle-server: server-handle-test $(ENV_SETUP) $(VALGRIND) ./server-handle-test -test-handle-client:: client-handle-test +test-handle-client: client-handle-test $(ENV_SETUP) $(VALGRIND) ./client-handle-test test-noauth: init-test @@ -94,16 +94,16 @@ test-destroy: destroy-test test-setkey-client: client-setkey-test $(ENV_SETUP) $(VALGRIND) ./client-setkey-test testkeys admin admin -unit-test-client-setup:: +unit-test-client-setup: $(ENV_SETUP) $(VALGRIND) $(START_SERVERS) -unit-test-client-cleanup:: +unit-test-client-cleanup: $(ENV_SETUP) $(STOP_SERVERS) -unit-test-server-setup:: +unit-test-server-setup: $(ENV_SETUP) $(VALGRIND) $(START_SERVERS_LOCAL) -unit-test-server-cleanup:: +unit-test-server-cleanup: $(ENV_SETUP) $(STOP_SERVERS_LOCAL) unit-test-client-body: site.exp test-noauth test-destroy test-handle-client \ @@ -126,7 +126,7 @@ unit-test-server-body: site.exp test-handle-server lock-test -mv api.log sapi.log -mv api.sum sapi.sum -clean:: +clean: $(RM) init-test client_init.o init-test.o $(RM) destroy-test destroy-test.o $(RM) client-handle-test handle-test.o client-handle-test.o diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 16cd5db..ea756a6 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -47,21 +47,21 @@ STLIBOBJS= \ EXTRADEPSRCS= t_stringattr.c t_ulog.c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs $(RM) adb_err.c adb_err.h t_stringattr.o t_stringattr $(RM) t_ulog.o t_ulog test.ulog -check-unix:: t_ulog +check-unix: t_ulog $(RUN_TEST) ./t_ulog test.ulog -check-pytests:: t_stringattr +check-pytests: t_stringattr $(RUNPYTEST) $(srcdir)/t_stringattr.py $(PYTESTFLAGS) generate-files-mac: darwin.exports -depend:: adb_err.h +depend: adb_err.h t_stringattr: t_stringattr.o $(KDB5_DEPLIBS) $(KADM_COMM_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ t_stringattr.o $(KDB5_LIBS) $(KADM_COMM_LIBS) \ diff --git a/src/lib/krad/Makefile.in b/src/lib/krad/Makefile.in index 3c732ef..8c3317f 100644 --- a/src/lib/krad/Makefile.in +++ b/src/lib/krad/Makefile.in @@ -26,12 +26,12 @@ SRCS=attr.c attrset.c client.c code.c packet.c remote.c \ STOBJLISTS=OBJS.ST -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs -check-unix:: t_attr t_attrset t_code t_packet t_remote t_client +check-unix: t_attr t_attrset t_code t_packet t_remote t_client $(RUN_TEST) ./t_attr $(RUN_TEST) ./t_attrset $(RUN_TEST) ./t_code diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index d9cddc1..1b8f2d7 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -58,16 +58,16 @@ SHLIB_EXPDEPS = \ $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS) -all-unix:: all-liblinks +all-unix: all-liblinks -all-windows:: +all-windows: clean-unix:: clean-liblinks clean-libs clean-libobjs clean-windows:: $(RM) $(OUTPRE)krb5.lib krb5.bak -install-unix:: install-libs +install-unix: install-libs @lib_frag@ @libobj_frag@ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 3028085..e2e6a35 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -27,7 +27,7 @@ OBJS= \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 516ad7f..625b0d1 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -89,13 +89,13 @@ EXTRADEPSRCS= \ ##DOS##OBJS=$(OBJS) $(OUTPRE)ccfns.$(OBJEXT) -all-unix:: all-libobjs +all-unix: all-libobjs -all-windows:: subdirs $(OBJFILE) +all-windows: subdirs $(OBJFILE) -##DOS##subdirs:: ccapi\$(OUTPRE)file.lst +##DOS##subdirs: ccapi\$(OUTPRE)file.lst -##DOS##ccapi\$(OUTPRE)file.lst:: +##DOS##ccapi\$(OUTPRE)file.lst: ##DOS## cd ccapi ##DOS## @echo Making in krb5\ccache\ccapi ##DOS## $(MAKE) -$(MFLAGS) @@ -137,18 +137,18 @@ T_MARSHAL_OBJS = t_marshal.o t_marshal: $(T_MARSHAL_OBJS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ $(T_MARSHAL_OBJS) $(KRB5_BASE_LIBS) -check-unix:: t_cc t_marshal +check-unix: t_cc t_marshal $(RUN_TEST) ./t_cc $(RUN_TEST) ./t_marshal testcache -check-pytests:: t_cccursor t_cccol +check-pytests: t_cccursor t_cccol $(RUNPYTEST) $(srcdir)/t_cccol.py $(PYTESTFLAGS) clean-unix:: $(RM) t_cc t_cc.o t_cccursor t_cccursor.o t_cccol t_cccol.o $(RM) t_marshal t_marshal.o testcache -depend:: $(KCMRPC_DEPS) +depend: $(KCMRPC_DEPS) ##WIN32##$(OUTPRE)cc_mslsa.$(OBJEXT): cc_mslsa.c $(top_srcdir)/include/k5-int.h $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in index cca858c..7365737 100644 --- a/src/lib/krb5/ccache/ccapi/Makefile.in +++ b/src/lib/krb5/ccache/ccapi/Makefile.in @@ -20,7 +20,7 @@ SRCS = $(srcdir)/stdcc.c $(srcdir)/stdcc_util.c $(srcdir)/winccld.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index 2f86dea..4e0591e 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -21,7 +21,7 @@ SRCS= asn1_err.c kdb5_err.c krb5_err.c k5e1_err.c kv5m_err.c krb524_err.c ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs all-libobjs: $(HDRS) includes: $(HDRS) diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 28485d5..2a8fceb 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -44,16 +44,16 @@ SRCS= \ EXTRADEPSRCS= \ $(srcdir)/t_keytab.c -all-windows:: $(OBJFILE) +all-windows: $(OBJFILE) ##DOS$(OBJFILE): $(OBJS) ##DOS $(RM) $(OBJFILE) ##WIN32## $(LIBECHO) -p $(PREFIXDIR)\ $(OUTPRE)*.obj > $(OBJFILE) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs -check-unix:: t_keytab +check-unix: t_keytab $(RUN_TEST) ./t_keytab T_KEYTAB_OBJS = t_keytab.o diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index ad5ef93..7a7ae2e 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -376,7 +376,7 @@ $(srcdir)/deltat.c : $(DELTAT_DEP) ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs COMERRLIB=$(TOPLIBD)/libcom_err.a @@ -454,7 +454,7 @@ TEST_PROGS= t_walk_rtree t_kerb t_ser t_deltat t_expand t_authdata t_pac \ t_in_ccache t_cc_config t_copy_context \ t_princ t_etypes t_vfy_increds t_response_items t_sname_match -check-unix:: $(TEST_PROGS) +check-unix: $(TEST_PROGS) $(RUN_TEST_LOCAL_CONF) ./t_kerb \ parse_name tytso \ parse_name tytso@SHAZAAM \ @@ -490,12 +490,12 @@ check-unix:: $(TEST_PROGS) $(RUN_TEST) ./t_copy_context $(RUN_TEST) ./t_sname_match -check-pytests:: t_expire_warn t_vfy_increds +check-pytests: t_expire_warn t_vfy_increds $(RUNPYTEST) $(srcdir)/t_expire_warn.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_vfy_increds.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_in_ccache_patypes.py $(PYTESTFLAGS) -clean:: +clean: $(RM) $(OUTPRE)t_walk_rtree$(EXEEXT) $(OUTPRE)t_walk_rtree.$(OBJEXT) \ $(OUTPRE)t_kerb$(EXEEXT) $(OUTPRE)t_kerb.$(OBJEXT) \ $(OUTPRE)t_ser$(EXEEXT) $(OUTPRE)t_ser.$(OBJEXT) \ diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 7d93db0..1951235 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -158,7 +158,7 @@ EXTRADEPSRCS = \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs shared: @@ -199,10 +199,10 @@ lclint-localaddr: localaddr.c $(LCLINT) $(LCLINTOPTS) $(CPPFLAGS) $(LOCALINCLUDES) $(DEFS) \ -DTEST $(srcdir)/localaddr.c -check-unix:: check-unix-stdconf check-unix-locate check-unix-trace \ +check-unix: check-unix-stdconf check-unix-locate check-unix-trace \ check-unix-expand -check-unix-stdconf:: t_std_conf +check-unix-stdconf: t_std_conf $(RUN_TEST_LOCAL_CONF) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \ -D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \ -r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \ @@ -218,7 +218,7 @@ NSPAT = '^_kerberos.*service' DIG = @DIG@ NSLOOKUP = @NSLOOKUP@ -check-unix-locate:: t_locate_kdc +check-unix-locate: t_locate_kdc if [ "$(OFFLINE)" = no ]; then \ if $(DIG) $(SRVNAME) srv | grep -i $(DIGPAT) || \ $(NSLOOKUP) -q=srv $(SRVNAME) | grep -i $(NSPAT); then \ @@ -232,14 +232,14 @@ check-unix-locate:: t_locate_kdc echo 'Skipped t_locate_kdc test: OFFLINE' >> $(SKIPTESTS); \ fi -check-unix-trace:: t_trace +check-unix-trace: t_trace rm -f t_trace.out KRB5_TRACE=t_trace.out ; export KRB5_TRACE ; \ $(RUN_TEST) ./t_trace sed -e 's/^[^:]*: //' t_trace.out | cmp - $(srcdir)/t_trace.ref rm -f t_trace.out -check-unix-expand:: t_expand_path +check-unix-expand: t_expand_path $(RUN_TEST) ./t_expand_path '%{null}' '' $(RUN_TEST) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \ ' $(CLIENT_BINDIR)$(KRB5_LIBDIR) ' @@ -247,7 +247,7 @@ check-unix-expand:: t_expand_path 'the %{animal}%{s} on the %{place}%{s}' \ 'the frogs on the pads' -clean:: +clean: $(RM) $(TEST_PROGS) test.out t_std_conf.o t_locate_kdc.o t_trace.o $(RM) t_expand_path.o diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 38b399a..dc24c42 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -8,7 +8,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. STLIBOBJS= # empty... @LIBOBJS@ OBJS = # empty... @LIBOBJS@ -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs ##WIN32##LIBOBJS = $(OUTPRE)syslog.obj diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index b6095cd..5b800c5 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -38,7 +38,7 @@ SRCS= \ ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs T_REPLAY_OBJS= t_replay.o diff --git a/src/lib/krb5/unicode/Makefile.in b/src/lib/krb5/unicode/Makefile.in index 9a4fb97..e23028d 100644 --- a/src/lib/krb5/unicode/Makefile.in +++ b/src/lib/krb5/unicode/Makefile.in @@ -28,7 +28,7 @@ EXTRADEPSRCS = ##DOS##LIBOBJS = $(OBJS) -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs shared: @@ -64,9 +64,9 @@ ucgendat: ucgendat.o $(XXSRCS) $(XXHEADERS) : .links -clean:: +clean: $(RM) *.dat .links $(XXHEADERS) $(XXSRCS) ucgendat -depend:: .links +depend: .links @libobj_frag@ diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 487dcff..3b4f104 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -167,13 +167,13 @@ HDRDIR=$(BUILDTOP)/include/gssrpc all-prerecurse: all-liblinks -all-windows:: $(OBJS) +all-windows: $(OBJS) generate-files-mac: darwin.exports -install-unix:: install-libs +install-unix: install-libs -install-unix:: +install-unix: for i in $(SRC_HDRS); do \ (set -x; $(INSTALL_DATA) $(srcdir)/../../include/gssrpc/$$i $(DESTDIR)$(KRB5_INCDIR)$(S)gssrpc$(S)$$i) ; \ done @@ -186,14 +186,14 @@ SRC_HDRS = auth.h auth_gss.h auth_gssapi.h auth_unix.h clnt.h \ netdb.h pmap_clnt.h pmap_prot.h pmap_rmt.h rename.h \ rpc.h rpc_msg.h svc.h svc_auth.h xdr.h -check-windows:: +check-windows: clean-unix:: clean-liblinks clean-libs clean-libobjs clean-windows:: # stuff picked up from old "dyn" library -#check-unix:: run-dyntest +#check-unix: run-dyntest run-dyntest: dyntest ./dyntest dyntest: dyntest.o dyn.o @@ -216,7 +216,7 @@ LCLINTOPTS=+posixlib \ +ignoresigns -predboolint \ +mod-uncon +modinternalstrict +modfilesys \ -expect 2 -do-dyn-lclint:: +do-dyn-lclint: $(LCLINT) $(LCLINTOPTS) $(LOCALINCLUDES) $(DEFS) dyn.c dyntest.c $(BUILDTOP)/include/gssrpc/types.h: types.stamp diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 0ba9984..6f29e33 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -4,7 +4,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o SRCS= client.c rpc_test_clnt.c rpc_test_svc.c server.c -all:: client server +all: client server client: client.o rpc_test_clnt.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o client client.o rpc_test_clnt.o \ @@ -26,11 +26,11 @@ client.o server.o: rpc_test.h # rpcgen -m rpc_test.x -o rpc_test_svc.c # rpcgen -h rpc_test.x -o rpc_test.h # -# clean:: +# clean: # rm -f rpc_test.h rpc_test_clnt.c rpc_test_svc.c # -check unit-test:: unit-test-@DO_TEST@ +check unit-test: unit-test-@DO_TEST@ unit-test-: @echo "+++" @@ -39,7 +39,7 @@ unit-test-: @echo "+++" @echo 'Skipped rpc tests: runtest or Perl not found' >> $(SKIPTESTS) -unit-test-ok:: unit-test-body +unit-test-ok: unit-test-body PASS=@PASS@ unit-test-body: @@ -60,7 +60,7 @@ unit-test-body: trap 0 ; exit 0 ; \ else exit 1 ; fi -clean:: +clean: $(RM) server client $(RM) dbg.log rpc_test.log rpc_test.sum diff --git a/src/man/Makefile.in b/src/man/Makefile.in index 2b9c892..4bc670b 100644 --- a/src/man/Makefile.in +++ b/src/man/Makefile.in @@ -51,16 +51,16 @@ $(docsrc)/version.py: $(top_srcdir)/patchlevel.h -e 's|@KTNAME@|$(DEFKTNAME)|g' \ -e 's|@CKTNAME@|$(DEFCKTNAME)|g' $? > $@ -all:: $(MANSUBS) +all: $(MANSUBS) -clean:: +clean: rm -rf $(MANSUBS) rst_man -install:: install-clientman install-fileman install-adminman install-serverman +install: install-clientman install-fileman install-adminman install-serverman -install-catman:: install-clientcat install-filecat install-admincat install-servercat +install-catman: install-clientcat install-filecat install-admincat install-servercat -install-clientman:: +install-clientman: $(INSTALL_DATA) k5srvutil.sub $(DESTDIR)$(CLIENT_MANDIR)/k5srvutil.1 $(INSTALL_DATA) kadmin.sub $(DESTDIR)$(CLIENT_MANDIR)/kadmin.1 $(INSTALL_DATA) kdestroy.sub $(DESTDIR)$(CLIENT_MANDIR)/kdestroy.1 @@ -74,7 +74,7 @@ install-clientman:: $(INSTALL_DATA) kvno.sub $(DESTDIR)$(CLIENT_MANDIR)/kvno.1 $(INSTALL_DATA) sclient.sub $(DESTDIR)$(CLIENT_MANDIR)/sclient.1 -install-fileman:: +install-fileman: $(INSTALL_DATA) $(srcdir)/dot.k5identity.5 \ $(DESTDIR)$(FILE_MANDIR)/.k5identity.5 $(INSTALL_DATA) k5identity.sub $(DESTDIR)$(FILE_MANDIR)/k5identity.5 @@ -85,7 +85,7 @@ install-fileman:: $(INSTALL_DATA) kdc.conf.sub $(DESTDIR)$(FILE_MANDIR)/kdc.conf.5 $(INSTALL_DATA) krb5.conf.sub $(DESTDIR)$(FILE_MANDIR)/krb5.conf.5 -install-adminman:: +install-adminman: $(INSTALL_DATA) $(srcdir)/kadmin.local.8 \ $(DESTDIR)$(ADMIN_MANDIR)/kadmin.local.8 $(INSTALL_DATA) kdb5_ldap_util.sub \ @@ -94,13 +94,13 @@ install-adminman:: $(INSTALL_DATA) kprop.sub $(DESTDIR)$(ADMIN_MANDIR)/kprop.8 $(INSTALL_DATA) kproplog.sub $(DESTDIR)$(ADMIN_MANDIR)/kproplog.8 -install-serverman:: +install-serverman: $(INSTALL_DATA) kadmind.sub $(DESTDIR)$(SERVER_MANDIR)/kadmind.8 $(INSTALL_DATA) kpropd.sub $(DESTDIR)$(SERVER_MANDIR)/kpropd.8 $(INSTALL_DATA) krb5kdc.sub $(DESTDIR)$(SERVER_MANDIR)/krb5kdc.8 $(INSTALL_DATA) sserver.sub $(DESTDIR)$(SERVER_MANDIR)/sserver.8 -install-clientcat:: +install-clientcat: $(GROFF_MAN) k5srvutil.sub > $(DESTDIR)$(CLIENT_CATDIR)/k5srvutil.1 $(GROFF_MAN) kadmin.sub > $(DESTDIR)$(CLIENT_CATDIR)/kadmin.1 $(GROFF_MAN) kdestroy.sub > $(DESTDIR)$(CLIENT_CATDIR)/kdestroy.1 @@ -114,7 +114,7 @@ install-clientcat:: $(GROFF_MAN) kvno.sub > $(DESTDIR)$(CLIENT_CATDIR)/kvno.1 $(GROFF_MAN) sclient.sub > $(DESTDIR)$(CLIENT_CATDIR)/sclient.1 -install-filecat:: +install-filecat: $(GROFF_MAN) k5identity.sub > $(DESTDIR)$(FILE_CATDIR)/k5identity.5 ($(RM) $(DESTDIR)$(FILE_CATDIR)/.k5identity.5; \ $(LN_S) $(FILE_CATDIR)/k5identity.5 \ @@ -127,7 +127,7 @@ install-filecat:: $(GROFF_MAN) kdc.conf.sub > $(DESTDIR)$(FILE_CATDIR)/kdc.conf.5 $(GROFF_MAN) krb5.conf.sub > $(DESTDIR)$(FILE_CATDIR)/krb5.conf.5 -install-admincat:: +install-admincat: ($(RM) $(DESTDIR)$(ADMIN_CATDIR)/kadmin.local.8; \ $(LN_S) $(CLIENT_CATDIR)/kadmin.1 \ $(DESTDIR)$(ADMIN_CATDIR)/kadmin.local.8) @@ -137,7 +137,7 @@ install-admincat:: $(GROFF_MAN) kprop.sub > $(DESTDIR)$(ADMIN_CATDIR)/kprop.8 $(GROFF_MAN) kproplog.sub > $(DESTDIR)$(ADMIN_CATDIR)/kproplog.8 -install-servercat:: +install-servercat: $(GROFF_MAN) kadmind.sub > $(DESTDIR)$(SERVER_CATDIR)/kadmind.8 $(GROFF_MAN) kpropd.sub > $(DESTDIR)$(SERVER_CATDIR)/kpropd.8 $(GROFF_MAN) krb5kdc.sub > $(DESTDIR)$(SERVER_CATDIR)/krb5kdc.8 diff --git a/src/plugins/audit/Makefile.in b/src/plugins/audit/Makefile.in index 812af60..e2f57c9 100644 --- a/src/plugins/audit/Makefile.in +++ b/src/plugins/audit/Makefile.in @@ -7,13 +7,13 @@ SRCS=kdc_j_encode.c AUJENC_HDR=$(BUILDTOP)$(S)include$(S)kdc_j_encode.h -all-unix:: all-libobjs includes +all-unix: all-libobjs includes clean-unix:: clean-libobjs $(RM) $(AUJENC_HDR) -includes:: $(AUJENC_HDR) -depend:: $(AUJENC_HDR) +includes: $(AUJENC_HDR) +depend: $(AUJENC_HDR) $(AUJENC_HDR): $(srcdir)/kdc_j_encode.h $(RM) $@ diff --git a/src/plugins/audit/simple/Makefile.in b/src/plugins/audit/simple/Makefile.in index 54961c4..158ea75 100644 --- a/src/plugins/audit/simple/Makefile.in +++ b/src/plugins/audit/simple/Makefile.in @@ -15,11 +15,11 @@ STLIBOBJS= au_simple_main.o SRCS= $(srcdir)/au_simple_main.c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs -clean:: +clean: $(RM) au_simple_main.o kdc_j_encode.o $(RM) lib$(LIBBASE)$(SO_EXT) diff --git a/src/plugins/audit/test/Makefile.in b/src/plugins/audit/test/Makefile.in index 130b024..1bc2755 100644 --- a/src/plugins/audit/test/Makefile.in +++ b/src/plugins/audit/test/Makefile.in @@ -14,7 +14,7 @@ STLIBOBJS= au_test.o SRCS= $(srcdir)/au_test.c -all-unix:: all-liblinks +all-unix: all-liblinks clean-unix:: clean-liblinks clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/authdata/greet_client/Makefile.in b/src/plugins/authdata/greet_client/Makefile.in index e1af8cc..ffa29ac 100644 --- a/src/plugins/authdata/greet_client/Makefile.in +++ b/src/plugins/authdata/greet_client/Makefile.in @@ -11,8 +11,8 @@ STLIBOBJS= greet.o SRCS= greet.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/authdata/greet_server/Makefile.in b/src/plugins/authdata/greet_server/Makefile.in index a013076..78a062d 100644 --- a/src/plugins/authdata/greet_server/Makefile.in +++ b/src/plugins/authdata/greet_server/Makefile.in @@ -12,8 +12,8 @@ STLIBOBJS= greet_auth.o SRCS= greet_auth.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/hostrealm/test/Makefile.in b/src/plugins/hostrealm/test/Makefile.in index d0acc3b..e624aa1 100644 --- a/src/plugins/hostrealm/test/Makefile.in +++ b/src/plugins/hostrealm/test/Makefile.in @@ -13,8 +13,8 @@ STLIBOBJS=main.o SRCS= $(srcdir)/main.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/kadm5_hook/test/Makefile.in b/src/plugins/kadm5_hook/test/Makefile.in index 617371d..2d48ec7 100644 --- a/src/plugins/kadm5_hook/test/Makefile.in +++ b/src/plugins/kadm5_hook/test/Makefile.in @@ -15,8 +15,8 @@ STLIBOBJS=main.o SRCS= $(srcdir)/main.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in index dac3275..3a064ff 100644 --- a/src/plugins/kdb/db2/Makefile.in +++ b/src/plugins/kdb/db2/Makefile.in @@ -59,13 +59,13 @@ STLIBOBJS= \ db2_exp.o \ lockout.o -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs $(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse -clean:: +clean: $(RM) .depend-verify-db @libnover_frag@ diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in index 0de98a9..22b23f7 100644 --- a/src/plugins/kdb/db2/libdb2/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/Makefile.in @@ -16,17 +16,17 @@ HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h SHLIB_EXPDEPS=$(SUPPORT_DEPLIB) SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS) -all-unix:: includes all-libs +all-unix: includes all-libs all-prerecurse depend-prerecurse: $(HDRS) clean-unix:: clean-libs clean-includes -includes:: $(HDRS) +includes: $(HDRS) $(HDRDIR)/db.h: $(srcdir)/include/db.hin $(CP) $(srcdir)/include/db.hin $@ $(HDRDIR)/db-config.h: include/db-config.hin $(CP) $(srcdir)/include/db-config.hin $@ -clean-includes:: +clean-includes: $(RM) $(HDRS) include/*.stmp @lib_frag@ diff --git a/src/plugins/kdb/db2/libdb2/btree/Makefile.in b/src/plugins/kdb/db2/libdb2/btree/Makefile.in index aa72ee9..2ff0bcb 100644 --- a/src/plugins/kdb/db2/libdb2/btree/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.in @@ -9,7 +9,7 @@ SRCS= $(STLIBOBJS:.o=.c) LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ -I$(srcdir)/../db -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/plugins/kdb/db2/libdb2/db/Makefile.in b/src/plugins/kdb/db2/libdb2/db/Makefile.in index 3e13713..1b9afa1 100644 --- a/src/plugins/kdb/db2/libdb2/db/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/db/Makefile.in @@ -4,7 +4,7 @@ STLIBOBJS=db.o LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/plugins/kdb/db2/libdb2/hash/Makefile.in b/src/plugins/kdb/db2/libdb2/hash/Makefile.in index 0031b6f..2283552 100644 --- a/src/plugins/kdb/db2/libdb2/hash/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.in @@ -6,7 +6,7 @@ STLIBOBJS= hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ -I$(srcdir)/../db -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in index c891a73..cacff78 100644 --- a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in @@ -4,7 +4,7 @@ STLIBOBJS=mpool.o LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/plugins/kdb/db2/libdb2/recno/Makefile.in b/src/plugins/kdb/db2/libdb2/recno/Makefile.in index f133413..2a9db95 100644 --- a/src/plugins/kdb/db2/libdb2/recno/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.in @@ -6,7 +6,7 @@ STLIBOBJS= rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ -I$(srcdir)/../db -all-unix:: all-libobjs +all-unix: all-libobjs clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in index 866787c..f75e720 100644 --- a/src/plugins/kdb/db2/libdb2/test/Makefile.in +++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in @@ -12,12 +12,12 @@ PROG_LIBPATH=-L.. -L$(TOPLIBD) DB_LIB = -ldb $(SUPPORT_LIB) DB_DEPLIB = ../libdb$(DEPLIBEXT) $(SUPPORT_DEPLIB) -all:: +all: dbtest: dbtest.o $(DB_DEPLIB) $(CC_LINK) -o $@ dbtest.o $(STRERROR_OBJ) $(DB_LIB) -check:: dbtest +check: dbtest $(RUN_SETUP) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test bttest.o: $(srcdir)/btree.tests/main.c diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in index 3dd4ba6..94df816 100644 --- a/src/plugins/kdb/ldap/Makefile.in +++ b/src/plugins/kdb/ldap/Makefile.in @@ -27,8 +27,8 @@ $(TOPLIBD)/libkdb_ldap$(SHLIBEXT) : all-recurse STLIBOBJS= ldap_exp.o -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in index b9ea339..8669c24 100644 --- a/src/plugins/kdb/ldap/ldap_util/Makefile.in +++ b/src/plugins/kdb/ldap/ldap_util/Makefile.in @@ -11,7 +11,7 @@ OBJS = kdb5_ldap_util.o kdb5_ldap_list.o kdb5_ldap_realm.o kdb5_ldap_policy.o kd GETDATE = $(srcdir)/../../../../kadmin/cli/getdate.y -all:: $(PROG) +all: $(PROG) $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIB) $(GETDATE) $(CC_LINK) -o $(PROG) $(OBJS) \ @@ -22,8 +22,8 @@ getdate.c: $(GETDATE) $(YACC) $(GETDATE) $(MV) y.tab.c getdate.c -install:: +install: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) -clean:: +clean: $(RM) $(PROG) $(OBJS) getdate.c diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in index d302cf2..b40d639 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in +++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in @@ -61,8 +61,8 @@ STLIBOBJS= kdb_ldap.o \ ldap_err.o \ lockout.o -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libobjs clean-libs @lib_frag@ diff --git a/src/plugins/kdb/test/Makefile.in b/src/plugins/kdb/test/Makefile.in index f9578a3..9006023 100644 --- a/src/plugins/kdb/test/Makefile.in +++ b/src/plugins/kdb/test/Makefile.in @@ -13,8 +13,8 @@ SRCS = $(srcdir)/kdb_test.c STLIBOBJS = kdb_test.o -all-unix:: all-liblinks -install-unix:: +all-unix: all-liblinks +install-unix: clean-unix:: clean-liblinks clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/localauth/test/Makefile.in b/src/plugins/localauth/test/Makefile.in index c509f83..2a12d14 100644 --- a/src/plugins/localauth/test/Makefile.in +++ b/src/plugins/localauth/test/Makefile.in @@ -12,8 +12,8 @@ STLIBOBJS=main.o SRCS=$(srcdir)/main.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/locate/python/Makefile.in b/src/plugins/locate/python/Makefile.in index 38bed86..236e172 100644 --- a/src/plugins/locate/python/Makefile.in +++ b/src/plugins/locate/python/Makefile.in @@ -14,8 +14,8 @@ SRCS= \ $(srcdir)/py-locate.c STLIBOBJS= py-locate.o -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/preauth/cksum_body/Makefile.in b/src/plugins/preauth/cksum_body/Makefile.in index 0db924e..82b2846 100644 --- a/src/plugins/preauth/cksum_body/Makefile.in +++ b/src/plugins/preauth/cksum_body/Makefile.in @@ -16,8 +16,8 @@ STLIBOBJS=cksum_body_main.o SRCS= $(srcdir)/cksum_body_main.c -all-unix:: $(LIBBASE)$(SO_EXT) -install-unix:: install-libs +all-unix: $(LIBBASE)$(SO_EXT) +install-unix: install-libs clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/preauth/otp/Makefile.in b/src/plugins/preauth/otp/Makefile.in index b512c87..a5e137d 100644 --- a/src/plugins/preauth/otp/Makefile.in +++ b/src/plugins/preauth/otp/Makefile.in @@ -20,11 +20,11 @@ SRCS = \ $(srcdir)/otp_state.c \ $(srcdir)/main.c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs -clean:: +clean: $(RM) lib$(LIBBASE)$(SO_EXT) @libnover_frag@ diff --git a/src/plugins/preauth/pkinit/Makefile.in b/src/plugins/preauth/pkinit/Makefile.in index 2c24a99..3bb88d8 100644 --- a/src/plugins/preauth/pkinit/Makefile.in +++ b/src/plugins/preauth/pkinit/Makefile.in @@ -37,14 +37,14 @@ SRCS= \ $(srcdir)/pkinit_matching.c \ $(srcdir)/pkinit_crypto_$(PKINIT_CRYPTO_IMPL).c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs -clean:: +clean: $(RM) pkinit_kdf_test pkinit_kdf_test.o -check-unix:: pkinit_kdf_test +check-unix: pkinit_kdf_test $(RUN_TEST) ./pkinit_kdf_test pkinit_kdf_test: pkinit_kdf_test.o $(STLIBOBJS) $(SHLIB_EXPDEPS) diff --git a/src/plugins/preauth/securid_sam2/Makefile.in b/src/plugins/preauth/securid_sam2/Makefile.in index 4245f8a..f278d1a 100644 --- a/src/plugins/preauth/securid_sam2/Makefile.in +++ b/src/plugins/preauth/securid_sam2/Makefile.in @@ -19,8 +19,8 @@ STLIBOBJS=securid_sam2_main.o securid2.o grail.o SRCS= $(srcdir)/securid_sam2_main.c $(srcdir)/securid2.c $(srcdir)/grail.c -all-unix:: all-libs -install-unix:: install-libs +all-unix: all-libs +install-unix: install-libs clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/preauth/test/Makefile.in b/src/plugins/preauth/test/Makefile.in index bcb25c5..3da5ca8 100644 --- a/src/plugins/preauth/test/Makefile.in +++ b/src/plugins/preauth/test/Makefile.in @@ -13,8 +13,8 @@ STLIBOBJS=cltest.o kdctest.o SRCS= $(srcdir)/cltest.c $(srcdir)/kdctest.c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in index 297be13..7b6ba99 100644 --- a/src/plugins/preauth/wpse/Makefile.in +++ b/src/plugins/preauth/wpse/Makefile.in @@ -16,8 +16,8 @@ STLIBOBJS=wpse_main.o SRCS=wpse_main.c -all-unix:: all-libs -install-unix:: install-libs +all-unix: all-libs +install-unix: install-libs clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/pwqual/test/Makefile.in b/src/plugins/pwqual/test/Makefile.in index 39da500..278981d 100644 --- a/src/plugins/pwqual/test/Makefile.in +++ b/src/plugins/pwqual/test/Makefile.in @@ -13,8 +13,8 @@ STLIBOBJS=main.o SRCS= $(srcdir)/main.c -all-unix:: all-libs -install-unix:: +all-unix: all-libs +install-unix: clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/plugins/tls/k5tls/Makefile.in b/src/plugins/tls/k5tls/Makefile.in index e5ae830..48b7a8f 100644 --- a/src/plugins/tls/k5tls/Makefile.in +++ b/src/plugins/tls/k5tls/Makefile.in @@ -14,8 +14,8 @@ STLIBOBJS=openssl.o notls.o SRCS=$(srcdir)/openssl.c $(srcdir)/notls.c -all-unix:: all-liblinks -install-unix:: install-libs +all-unix: all-liblinks +install-unix: install-libs clean-unix:: clean-libs clean-libobjs @libnover_frag@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index ac42630..fdaf872 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -24,7 +24,7 @@ CATALOGS=en_US.mo .po.mo: msgfmt -o $@ $< -all:: $(CATALOGS) +all: $(CATALOGS) update-po: csrcs check_et_@COM_ERR_VERSION@ $(XGETTEXT) -k_ -kN_ -o $(POTFILE) -f csrcs @@ -40,7 +40,7 @@ check_et_sys: always: -install:: +install: for c in $(CATALOGS); do \ lang=`basename $$c .mo`; \ $(top_srcdir)/config/mkinstalldirs \ @@ -49,5 +49,5 @@ install:: $(DESTDIR)$(KRB5_LOCALEDIR)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \ done -clean:: +clean: $(RM) $(CATALOGS) diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 61e32ec..657a030 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,7 +1,7 @@ mydir=slave BUILDTOP=$(REL).. -all:: kprop kpropd kproplog +all: kprop kpropd kproplog CLIENTSRCS= $(srcdir)/kprop.c $(srcdir)/kprop_sock.c CLIENTOBJS= kprop.o kprop_sock.o @@ -24,14 +24,12 @@ kpropd: $(SERVEROBJS) $(KDB5_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) $( kproplog: $(LOGOBJS) $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) -install:: +install: for f in kprop kpropd kproplog; do \ $(INSTALL_PROGRAM) $$f \ $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \ done -clean:: +clean: $(RM) $(CLIENTOBJS) $(SERVEROBJS) $(LOGOBJS) - -clean:: $(RM) kprop kpropd kproplog diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 2eb6daa..47ca322 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -68,7 +68,7 @@ unlockiter: unlockiter.o $(KDB5_DEPLIBS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ unlockiter.o $(KDB5_LIBS) $(KADMSRV_LIBS) \ $(KRB5_BASE_LIBS) -check-unix:: kdb_check +check-unix: kdb_check kdc.conf: Makefile rm -rf kdc.conf @@ -110,8 +110,8 @@ kdb_check: kdc.conf krb5.conf $(RUN_DB_TEST) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) destroy -f $(RM) $(TEST_DB)* stash_file -check-pytests:: adata etinfo gcred hist hooks hrealm icred kdbtest localauth -check-pytests:: plugorder rdreq responder s2p s4u2proxy unlockiter +check-pytests: adata etinfo gcred hist hooks hrealm icred kdbtest localauth +check-pytests: plugorder rdreq responder s2p s4u2proxy unlockiter $(RUNPYTEST) $(srcdir)/t_general.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_hooks.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_dump.py $(PYTESTFLAGS) @@ -163,7 +163,7 @@ check-pytests:: plugorder rdreq responder s2p s4u2proxy unlockiter $(RUNPYTEST) $(srcdir)/t_princflags.py $(PYTESTFLAGS) $(RUNPYTEST) $(srcdir)/t_tabdump.py $(PYTESTFLAGS) -clean:: +clean: $(RM) adata etinfo gcred hist hooks hrealm icred kdbtest localauth $(RM) plugorder rdreq responder s2p s4u2proxy krb5.conf kdc.conf $(RM) -rf kdc_realm/sandbox ldap diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in index 422e535..fec4e10 100644 --- a/src/tests/asn.1/Makefile.in +++ b/src/tests/asn.1/Makefile.in @@ -11,7 +11,7 @@ ASN1SRCS= $(srcdir)/krb5.asn1 $(srcdir)/pkix.asn1 $(srcdir)/otp.asn1 \ $(srcdir)/pkinit.asn1 $(srcdir)/pkinit-agility.asn1 \ $(srcdir)/cammac.asn1 -all:: krb5_encode_test krb5_decode_test krb5_decode_leak t_trval +all: krb5_encode_test krb5_decode_test krb5_decode_leak t_trval LOCALINCLUDES = -I$(srcdir)/../../lib/krb5/asn.1 @@ -33,7 +33,7 @@ krb5_decode_leak: $(LEAKOBJS) $(KRB5_BASE_DEPLIBS) t_trval: t_trval.o $(CC) -o t_trval $(ALL_CFLAGS) t_trval.o -check:: check-encode check-encode-trval check-decode check-leak +check: check-encode check-encode-trval check-decode check-leak # Does not actually test for leaks unless using valgrind or a similar # tool, but does exercise a bunch of code. @@ -82,9 +82,9 @@ test-vectors: (cd vectors && $(CC) -I. -w *.c -o make-vectors) (cd vectors && ./make-vectors) -install:: +install: -clean:: +clean: rm -f *~ *.o krb5_encode_test krb5_decode_test krb5_decode_leak test.out trval t_trval expected_encode.out expected_trval.out trval.out diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index a710bfb..5a44dfd 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -3,15 +3,15 @@ BUILDTOP=$(REL)..$(S).. SRCS=$(srcdir)/kdb5_mkdums.c KDB5_DEP_LIBS=$(THREAD_LINKOPTS) $(DL_LIB) -all:: kdb5_mkdums +all: kdb5_mkdums kdb5_mkdums: kdb5_mkdums.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o kdb5_mkdums kdb5_mkdums.o $(KDB5_DEP_LIBS) $(KDB5_LIBS) $(KRB5_BASE_LIBS) -all:: kdb5_mkdums +all: kdb5_mkdums -install:: +install: -clean:: +clean: $(RM) kdb5_mkdums.o kdb5_mkdums diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in index ae0376b..e78e270 100644 --- a/src/tests/dejagnu/Makefile.in +++ b/src/tests/dejagnu/Makefile.in @@ -5,13 +5,13 @@ RUNTESTFLAGS = SRCS=$(srcdir)/t_inetd.c -all:: t_inetd +all: t_inetd -install:: +install: -check:: check-runtest-@HAVE_RUNTEST@ +check: check-runtest-@HAVE_RUNTEST@ -check-runtest-no:: +check-runtest-no: @echo "+++" @echo "+++ WARNING: tests/dejagnu tests not run." @echo "+++ runtest is unavailable." @@ -19,13 +19,13 @@ check-runtest-no:: @echo 'Skipped dejagnu tests: runtest not found' >> $(SKIPTESTS) # Set VALGRIND at run time, that may be changed when running 'make'. -check-runtest-yes:: t_inetd site.exp +check-runtest-yes: t_inetd site.exp $(RUNTEST) --tool krb VALGRIND="$(VALGRIND)" $(RUNTESTFLAGS) -t_inetd:: t_inetd.o $(KRB5_BASE_DEPLIBS) +t_inetd: t_inetd.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS) -clean:: +clean: $(RM) t_inetd t_inetd.o site.exp runenv.vars runenv.vals clean-unix:: diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in index 5ef52bf..fe2f33b 100644 --- a/src/tests/gss-threads/Makefile.in +++ b/src/tests/gss-threads/Makefile.in @@ -9,10 +9,10 @@ SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c OBJS= gss-client.o gss-misc.o gss-server.o -all-unix:: all-unix-@THREAD_SUPPORT@ -all-unix-1:: gss-server gss-client -all-unix-0:: -all-windows:: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe +all-unix: all-unix-@THREAD_SUPPORT@ +all-unix-1: gss-server gss-client +all-unix-0: +all-windows: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe gss-server: gss-server.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) $(PTHREAD_CFLAGS) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS) @@ -29,6 +29,6 @@ $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $ clean-unix:: $(RM) gss-server gss-client -install-unix:: +install-unix: # $(INSTALL_PROGRAM) gss-client $(DESTDIR)$(CLIENT_BINDIR)/gss-tclient # $(INSTALL_PROGRAM) gss-server $(DESTDIR)$(SERVER_BINDIR)/gss-tserver diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in index 5604e8d..6c14642 100644 --- a/src/tests/gssapi/Makefile.in +++ b/src/tests/gssapi/Makefile.in @@ -29,18 +29,18 @@ OBJS= ccinit.o ccrefresh.o common.o t_accname.o t_ccselect.o t_ciflags.o \ COMMON_DEPS= common.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) COMMON_LIBS= common.o $(GSS_LIBS) $(KRB5_BASE_LIBS) -all:: ccinit ccrefresh t_accname t_ccselect t_ciflags t_credstore t_enctypes \ +all: ccinit ccrefresh t_accname t_ccselect t_ciflags t_credstore t_enctypes \ t_err t_export_cred t_export_name t_gssexts t_imp_cred t_imp_name \ t_invalid t_inq_cred t_inq_ctx t_inq_mechs_name t_iov t_namingexts \ t_oid t_pcontok t_prf t_s4u t_s4u2proxy_krb5 t_saslname t_spnego \ t_srcattrs -check-unix:: t_oid +check-unix: t_oid $(RUN_TEST) ./t_invalid $(RUN_TEST) ./t_oid $(RUN_TEST) ./t_prf -check-pytests:: ccinit ccrefresh t_accname t_ccselect t_ciflags t_credstore \ +check-pytests: ccinit ccrefresh t_accname t_ccselect t_ciflags t_credstore \ t_enctypes t_err t_export_cred t_export_name t_imp_cred t_inq_cred \ t_inq_ctx t_inq_mechs_name t_iov t_pcontok t_s4u t_s4u2proxy_krb5 \ t_spnego t_srcattrs @@ -107,7 +107,7 @@ t_spnego: t_spnego.o $(COMMON_DEPS) t_srcattrs: t_srcattrs.o $(COMMON_DEPS) $(CC_LINK) -o $@ t_srcattrs.o $(COMMON_LIBS) -clean:: +clean: $(RM) ccinit ccrefresh t_accname t_ccselect t_ciflags t_credstore $(RM) t_enctypes t_err t_export_cred t_export_name t_gssexts t_imp_cred $(RM) t_imp_name t_invalid t_inq_cred t_inq_ctx t_inq_mechs_name t_iov diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in index d498a57..3f0c435 100644 --- a/src/tests/hammer/Makefile.in +++ b/src/tests/hammer/Makefile.in @@ -3,13 +3,13 @@ BUILDTOP=$(REL)..$(S).. SRCS=$(srcdir)/kdc5_hammer.c -all:: kdc5_hammer +all: kdc5_hammer kdc5_hammer: kdc5_hammer.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o kdc5_hammer kdc5_hammer.o $(KRB5_BASE_LIBS) -install:: +install: -clean:: +clean: $(RM) kdc5_hammer.o kdc5_hammer diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in index 68d7bd9..81feb1d 100644 --- a/src/tests/misc/Makefile.in +++ b/src/tests/misc/Makefile.in @@ -15,9 +15,9 @@ SRCS=\ $(srcdir)/test_cxx_rpc.cpp \ $(srcdir)/test_cxx_kadm5.cpp -all:: test_getpw test_chpw_message +all: test_getpw test_chpw_message -check:: test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_rpc test_cxx_k5int test_cxx_kadm5 +check: test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_rpc test_cxx_k5int test_cxx_kadm5 $(RUN_TEST) ./test_getpw $(RUN_TEST) ./test_chpw_message $(RUN_TEST) ./test_cxx_krb5 @@ -51,8 +51,8 @@ test_cxx_gss.$(OBJEXT): test_cxx_gss.cpp test_cxx_rpc.$(OBJEXT): test_cxx_rpc.cpp test_cxx_kadm5.$(OBJEXT): test_cxx_kadm5.cpp -install:: +install: -clean:: +clean: $(RM) test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_k5int test_cxx_rpc test_cxx_kadm5 *.o diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in index 5a1eb13..e6248f8 100644 --- a/src/tests/resolve/Makefile.in +++ b/src/tests/resolve/Makefile.in @@ -5,7 +5,7 @@ OBJS=resolve.o addrinfo-test.o fake-addrinfo-test.o SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \ $(srcdir)/fake-addrinfo-test.c -all:: resolve addrinfo-test fake-addrinfo-test +all: resolve addrinfo-test fake-addrinfo-test resolve: resolve.o $(CC_LINK) -o $@ resolve.o $(LIBS) @@ -16,13 +16,13 @@ addrinfo-test: addrinfo-test.o fake-addrinfo-test: fake-addrinfo-test.o $(CC_LINK) -o $@ fake-addrinfo-test.o $(SUPPORT_LIB) $(LIBS) -check:: resolve addrinfo-test fake-addrinfo-test +check: resolve addrinfo-test fake-addrinfo-test $(RUN_TEST) ./resolve $(RUN_TEST) ./addrinfo-test -p telnet $(RUN_TEST) ./fake-addrinfo-test -p telnet -install:: +install: -clean:: +clean: $(RM) resolve addrinfo-test fake-addrinfo-test diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in index 9ad575d..ce67be4 100644 --- a/src/tests/shlib/Makefile.in +++ b/src/tests/shlib/Makefile.in @@ -6,7 +6,7 @@ BUILDTOP=$(REL)..$(S).. SRCS=$(srcdir)/t_loader.c -all:: +all: run-t_loader: t_loader $(RUN_TEST) ./t_loader @@ -14,10 +14,10 @@ run-t_loader: t_loader t_loader: t_loader.o $(CC_LINK) -o t_loader t_loader.o $(DL_LIB) -check-unix:: +check-unix: -install:: +install: -clean:: +clean: $(RM) t_loader.o t_loader diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in index 2bb2e26..e8d3e81 100644 --- a/src/tests/threads/Makefile.in +++ b/src/tests/threads/Makefile.in @@ -7,7 +7,7 @@ SRCS=$(srcdir)/t_rcache.c \ $(srcdir)/profread.c \ $(srcdir)/prof1.c -all:: +all: run-t_rcache: t_rcache $(RUN_TEST) ./t_rcache @@ -29,9 +29,9 @@ init_ctx: init_ctx.o $(KRB5_BASE_DEPLIBS) profread: profread.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) $(PTHREAD_CFLAGS) -o profread profread.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS) -check-unix:: run-t_rcache +check-unix: run-t_rcache -install:: +install: -clean:: +clean: $(RM) *.o t_rcache syms prof1 gss-perf diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in index 1c31b25..bdff9d6 100644 --- a/src/tests/verify/Makefile.in +++ b/src/tests/verify/Makefile.in @@ -4,13 +4,13 @@ KDB5_DEP_LIB=$(THREAD_LINKOPTS) $(DL_LIB) SRCS=$(srcdir)/kdb5_verify.c -all:: kdb5_verify +all: kdb5_verify kdb5_verify: kdb5_verify.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o kdb5_verify kdb5_verify.o $(KDB5_LIBS) $(KDB5_DEP_LIB) $(KRB5_BASE_LIBS) -install:: +install: -clean:: +clean: $(RM) kdb5_verify.o kdb5_verify 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 diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index bc884a3..9742122 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -50,18 +50,18 @@ LIBS = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile $(OUTPRE)$(NAME).exe +all: Makefile $(OUTPRE)$(NAME).exe $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ $(LIBS) $(SYSLIBS) $(SCLIB) $(_VC_MANIFEST_EMBED_EXE) -install:: +install: $(CP) $(OUTPRE)$(NAME).exe $(DESTDIR) $(CP) krb5.hlp $(DESTDIR) -clean:: +clean: $(RM) $(OUTPRE)*.exe $(RM) $(OUTPRE)*.res $(RM) $(OUTPRE)*.map diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index ab7c3ba..dfda87c 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -32,7 +32,7 @@ $(LIBRES): $(VERSIONRC) $(EXERES): $(VERSIONRC) $(RC) $(RCFLAGS) -DKFWCPCC_APP -fo $@ -r $** -all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe +all-windows: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe $(KFWLOGON): $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(LIBRES) link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) ../lib/$(OUTPRE)libwin.lib $(LIBRES) @@ -42,10 +42,10 @@ $(KFWCPCC): $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(EXERES) link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) ../lib/$(OUTPRE)libwin.lib $(EXERES) $(_VC_MANIFEST_EMBED_EXE) -install:: +install: copy $(OUTPRE)kfwlogon.dll $(DESTDIR) copy $(OUTPRE)kfwcpcc.exe $(DESTDIR) -clean:: +clean: $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in index 83e2b62..1b124e9 100644 --- a/src/windows/leash/Makefile.in +++ b/src/windows/leash/Makefile.in @@ -96,7 +96,7 @@ LIBS = $(GLIB) $(CLIB) $(WLIB) SYSLIBS = kernel32.lib Iphlpapi.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib version.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile $(OUTPRE)$(EXE_NAME).exe +all: Makefile $(OUTPRE)$(EXE_NAME).exe $(OUTPRE)$(EXE_NAME).exe: $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /out:$@ /ENTRY:WinMainCRTStartup $(OBJS) $(XOBJS) \ @@ -111,7 +111,7 @@ $(RESFILE): Leash.rc res/Leash.rc2 kfwribbon.rc ver.rc ../version.rc ../kerberos $(OUTPRE)LeashUIApplication.obj $(OUTPRE)LeashUICommandHandler.obj: kfwribbon.h -clean:: +clean: if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj if exist $(OUTPRE)*.res del $(OUTPRE)*.res diff --git a/src/windows/leash/htmlhelp/Makefile.in b/src/windows/leash/htmlhelp/Makefile.in index 21e783c..a0f3dfd 100644 --- a/src/windows/leash/htmlhelp/Makefile.in +++ b/src/windows/leash/htmlhelp/Makefile.in @@ -7,9 +7,9 @@ TARGET=..\$(OUTPRE)"MIT Kerberos.chm" HHP=MITKerberosHelp.hhp ERR=leash.log -all:: $(HHCOUT) +all: $(HHCOUT) -clean:: +clean: @if exist $(HHCOUT) del $(HHCOUT) @if exist $(TARGET) del $(TARGET) @if exist $(ERR) del $(ERR) diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in index b547d09..16e2b6d 100644 --- a/src/windows/leashdll/Makefile.in +++ b/src/windows/leashdll/Makefile.in @@ -67,8 +67,8 @@ DEFINES = $(DEFINES) -DDBG DEFINES = $(DEFINES) -DNO_AFS !endif -all-windows:: -all-windows:: $(OUTPRE)$(DLL_NAME).dll +all-windows: +all-windows: $(OUTPRE)$(DLL_NAME).dll clean-windows:: $(RM) $(OUTPRE)$(DLL_NAME).dll diff --git a/src/windows/lib/Makefile.in b/src/windows/lib/Makefile.in index c5fff76..eaaaecd 100644 --- a/src/windows/lib/Makefile.in +++ b/src/windows/lib/Makefile.in @@ -14,9 +14,9 @@ OBJS= $(OUTPRE)vardlg.obj $(OUTPRE)gic.obj $(OUTPRE)registry.obj \ $(OUTPRE)libwin.lib: $(OBJS) lib /nologo /out:$*.lib $(OBJS) -all-windows:: lib-windows +all-windows: lib-windows clean-windows:: $(RM) $(OUTPRE)*.exp $(OUTPRE)*.map $(OUTPRE)libwin.lib $(OUTPRE)*.obj -install-windows:: +install-windows: diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in index 9af69ce..6674cd6 100644 --- a/src/windows/ms2mit/Makefile.in +++ b/src/windows/ms2mit/Makefile.in @@ -21,7 +21,7 @@ $(MS2MITRES): $(VERSIONRC) $(MIT2MSRES): $(VERSIONRC) $(RC) $(RCFLAGS) -DMIT2MS_APP -fo $@ -r $** -all-windows:: $(MS2MIT) $(MIT2MS) +all-windows: $(MS2MIT) $(MIT2MS) $(MS2MIT): $(OUTPRE)ms2mit.obj $(MS2MITRES) link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)ms2mit.obj $(SLIB) user32.lib advapi32.lib $(KLIB) $(CLIB) $(MS2MITRES) @@ -31,9 +31,9 @@ $(MIT2MS): $(OUTPRE)mit2ms.obj $(MIT2MSRES) link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)mit2ms.obj $(SLIB) user32.lib advapi32.lib $(KLIB) $(CLIB) $(MIT2MSRES) $(_VC_MANIFEST_EMBED_EXE) -install:: +install: copy $(OUTPRE)ms2mit.exe $(DESTDIR) copy $(OUTPRE)mit2ms.exe $(DESTDIR) -clean:: +clean: $(RM) $(OUTPRE)*.exe diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 1ff8f59..7a6686e 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -30,17 +30,17 @@ LIBS = $(KLIB) $(CLIB) $(WLIB) SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile $(OUTPRE)telnet.exe +all: Makefile $(OUTPRE)telnet.exe $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ $(LIBS) $(SYSLIBS) $(SCLIB) $(_VC_MANIFEST_EMBED_EXE) -install:: +install: copy $(OUTPRE)telnet.exe $(DESTDIR) -clean:: +clean: $(RM) $(OUTPRE)*.exe $(OUTPRE)*.res $(OUTPRE)*.map $(RESFILE): ..\version.rc |