This change fixes the problem in the ss directory. It probably won't

get into our 1.3 release, but perhaps in a patch release afterwards.

I'll look and see where else things are getting needlessly rebuilt....

* Makefile.in (HDRS): Remove mit-sipb-copyright.h.
(includes): Depend on copied version of the headers, not local versions.  Don't
do any copying; instead, move the copying commands to new targets for each
header.
($(HDRDIR)/timestamp): New target; create the directory here if needed.
(clean-unix): Remove the timestamp file.

ticket: 1631
status: open

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

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 66c86c76443446e521ad96df961587659aa5e9ea..8cc5b8bef1745f17657144bc9861b9a9ddecd955 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (HDRS): Remove mit-sipb-copyright.h.
+       (includes): Depend on copied version of the headers, not local
+       versions.  Don't do any copying; instead, move the copying
+       commands to new targets for each header.
+       ($(HDRDIR)/timestamp): New target; create the directory here if
+       needed.
+       (clean-unix): Remove the timestamp file.
+
 2003-04-23  Ken Raeburn  <raeburn@mit.edu>
 
        * ss.h: Don't declare errno.  Include errno.h.

diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 26397a9ff6b7115d9d23aa81b75d6c5aceff14eb..d36b0ae3339264b2f307f415e3bff988b0a8981c 100644 (file)
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -87,34 +87,25 @@ includes:: mk_cmds ct_c.sed ct_c.awk ss_err.h
 
 HDRDIR=$(BUILDTOP)/include/ss
 HDRS = $(HDRDIR)/ss.h \
-       $(HDRDIR)/mit-sipb-copyright.h \
        $(HDRDIR)/ss_err.h
 
 BUILD_HDRS = ss_err.h
 SRC_HDRS = ss.h 
 SRC_HDRS_DEP = $(srcdir)/ss.h 
 
-includes:: $(SRC_HDRS_DEP) $(BUILD_HDRS)
+includes:: $(HDRS)
+$(HDRDIR)/timestamp:
        if [ -d $(HDRDIR) ] ; then :; else mkdir -p $(HDRDIR); fi
-       for i in $(SRC_HDRS) ; do \
-               if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \
-               else \
-                       (set -x; $(RM) $(HDRDIR)/$$i; \
-                        $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \
-               fi ; \
-       done
-       for i in $(BUILD_HDRS) ; do \
-               if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \
-               else \
-                       (set -x; $(RM) $(HDRDIR)/$$i; \
-                        $(CP) $$i $(HDRDIR)/$$i) ; \
-               fi ; \
-       done
-
-$(HDRS): includes
+       echo timestamp > $(HDRDIR)/timestamp
+$(HDRDIR)/ss.h: ss.h $(HDRDIR)/timestamp
+       $(RM) $(HDRDIR)/ss.h
+       $(CP) $(srcdir)/ss.h $(HDRDIR)/ss.h
+$(HDRDIR)/ss_err.h: ss_err.h $(HDRDIR)/timestamp
+       $(RM) $(HDRDIR)/ss_err.h
+       $(CP) ss_err.h $(HDRDIR)/ss_err.h
 
 clean-unix::
-       $(RM) $(HDRS)
+       $(RM) $(HDRS) $(HDRDIR)/timestamp
 
 std_rqs.c: std_rqs.ct mk_cmds ct_c.sed ct_c.awk