Fix some things to avoid spurious rebuilds of header files

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15177 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index d0577155ef4a9bcf5c3f77409f4f8608359f87c3..6a4af0d8796ed3d0b4b813bb07b0fbdb7f0d1e77 100644 (file)
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-10  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in ($(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h): 
+       Don't depend on all-recurse, as it causes spurious rebuilds of
+       these header files.
+
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,

diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 51b030c73601617456ec0cc0a22ed536d3344f58..49d1f7c0772dacfc7bb3a0505bb9a759b878bbef 100644 (file)
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -70,8 +70,8 @@ clean-windows::
        cd ..
        @echo Making clean in gssapi
 
-$(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h: all-recurse
-
+$(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h:
+       (cd generic && $(MAKE) '$$(BUILDTOP)/include/gssapi/gssapi.h' gssapi.h)
 
 # @lib_frag@
 # @libobj_frag@

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 96053e0b02c692389f037a0c484a91a7d1c3aa2e..43126077d9180f360a7515cfdaaa36f27e55ed97 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-10  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in: Fix $(EHDRDIR) creation to avoid spurious
+       rebuilds.
+
 2003-02-09  Ezra Peisach  <epeisach@bu,edu>
 
        * gssapiP_generic.h, util_token.c (g_token_size): Return unsigned

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 3e38040c687ba98cd3a018468a051ee35754731e..be9755ed3c4388ed379ad63b15d5dea2ead73fcf 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -20,9 +20,9 @@ EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 HDRS=  $(EHDRDIR)$(S)gssapi.h \
        $(EHDRDIR)$(S)gssapi_generic.h
 
-$(EHDRDIR)$(S)gssapi.h: gssapi.h create-ehdrdir
+$(EHDRDIR)$(S)gssapi.h: gssapi.h $(EHDRDIR)$(S)stamp
        $(CP) gssapi.h $@
-$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h create-ehdrdir
+$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h $(EHDRDIR)$(S)stamp
        $(CP) $(srcdir)$(S)gssapi_generic.h $@
 
 $(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
@@ -104,24 +104,28 @@ all-unix:: all-libobjs
 
 ##DOS##LIBOBJS = $(OBJS)
 
-all-windows:: create-ehdrdir $(HDRS)
+all-windows:: $(EHDRDIR)$(S)stamp $(HDRS)
 
-##DOS##create-ehdrdir:
-##DOS##        if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-##DOS##!if 0
-create-ehdrdir: includes-unix
-##DOS##!endif
+# windows
+$(EHDRDIR)\stamp:
+       if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
+       echo. > $@
+
+# unix
+$(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)
 
 clean-windows::
        $(RM) $(HDRS)
+       -if exist $(EHDRDIR)\stamp $(RM) $(EHDRDIR)\stamp
        -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
-includes-unix::
-       @if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi
-
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 install-headers-unix install:: gssapi.h
        @set -x; for f in $(EXPORTED_HEADERS) ; \