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/appl | |
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/appl')
-rw-r--r-- | src/appl/gss-sample/Makefile.in | 8 | ||||
-rw-r--r-- | src/appl/sample/sclient/Makefile.in | 6 | ||||
-rw-r--r-- | src/appl/sample/sserver/Makefile.in | 6 | ||||
-rw-r--r-- | src/appl/simple/client/Makefile.in | 6 | ||||
-rw-r--r-- | src/appl/simple/server/Makefile.in | 6 | ||||
-rw-r--r-- | src/appl/user_user/Makefile.in | 13 |
6 files changed, 21 insertions, 24 deletions
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 |