diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-02-13 00:23:45 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-02-13 00:23:45 +0000 |
| commit | 811091815c95d427a3ca545c5c80e084aa01c61c (patch) | |
| tree | 0c0684761c58a198f04b093dfa62420b643d9252 /src/lib/gssapi/generic | |
| parent | 35b388f4ad76e45348ac78611037201111b9aeaf (diff) | |
| download | krb5-811091815c95d427a3ca545c5c80e084aa01c61c.tar.gz krb5-811091815c95d427a3ca545c5c80e084aa01c61c.tar.xz krb5-811091815c95d427a3ca545c5c80e084aa01c61c.zip | |
More tweaks to deal with parallel builds
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15185 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/generic')
| -rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/Makefile.in | 35 |
2 files changed, 22 insertions, 19 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index b6b55340ab..3eb27c5fd8 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,9 @@ +2003-02-12 Tom Yu <tlyu@mit.edu> + + * Makefile.in: Remove stamp rules. Explicitly creates header + directory if needed. + (gssapi.h): Tweak to avoid race conditions. + 2003-02-11 Tom Yu <tlyu@mit.edu> * Makefile.in (gssapi-include): New rules to avoid coding diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index c7e01765e6..8ac282f374 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -20,14 +20,16 @@ EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi HDRS= $(EHDRDIR)$(S)gssapi.h \ $(EHDRDIR)$(S)gssapi_generic.h -EHDRDIRSTAMP=$(EHDRDIR)/stamp -##DOS##EHDRDIRSTAMP= +MK_EHDRDIR=if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)); fi +##DOS##MK_EHDRDIR=rem gssapi-include: $(EHDRDIR)$(S)gssapi.h -$(EHDRDIR)$(S)gssapi.h: gssapi.h $(EHDRDIRSTAMP) +$(EHDRDIR)$(S)gssapi.h: gssapi.h + @$(MK_EHDRDIR) $(CP) gssapi.h $@ -$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h $(EHDRDIRSTAMP) +$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h + @$(MK_EHDRDIR) $(CP) $(srcdir)$(S)gssapi_generic.h $@ $(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c @@ -35,14 +37,16 @@ gssapi_err_generic.h: gssapi_err_generic.et gssapi_err_generic.c: gssapi_err_generic.et gssapi.h: gssapi.hin - $(RM) $@ - echo "/* This is the gssapi.h prologue. */" >> $@ - echo "/* It contains some choice pieces of autoconf.h */" >> $@ - grep SIZEOF $(BUILDTOP)/include/krb5/autoconf.h >> $@ - grep 'HAVE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h >> $@ - grep 'USE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h >> $@ - echo "/* End of gssapi.h prologue. */" >> $@ - cat $(srcdir)/gssapi.hin >> $@ + @echo "Creating gssapi.h" ; \ + h=gss$$$$; $(RM) $$h; \ + (echo "/* This is the gssapi.h prologue. */"; \ + echo "/* It contains some choice pieces of autoconf.h */"; \ + grep SIZEOF $(BUILDTOP)/include/krb5/autoconf.h; \ + grep 'HAVE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \ + grep 'USE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \ + echo "/* End of gssapi.h prologue. */"; \ + cat $(srcdir)/gssapi.hin )> $$h && \ + (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e #if HasHashLibrary # UTIL_VALIDATE_SRC= $(srcdir)/util_validate.c @@ -102,7 +106,6 @@ EXPORTED_BUILT_HEADERS= gssapi.h $(OBJS): $(EXPORTED_HEADERS) $(ETHDRS) -all-unix:: includes-unix all-unix:: $(EXPORTED_HEADERS) $(ETHDRS) $(HDRS) all-unix:: all-libobjs @@ -115,12 +118,6 @@ all-windows:: $(HDRS) win-create-ehdrdir: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) -$(EHDRDIR)/stamp: - @if test -d $(EHDRDIR); then :; \ - else (set -x; mkdir $(EHDRDIR)) fi; touch $@ - -includes-unix: $(EHDRDIR)$(S)stamp - clean-unix:: clean-libobjs $(RM) $(ETHDRS) $(ETSRCS) $(HDRS) $(EXPORTED_BUILT_HEADERS) |