* lib.in ($(SUBDIROBJLISTS) and .SH/.PF variants): Depend on recursion. Use

extra dummy target in case the variable is empty.
* post.in (ALL_DEP_SRCS): New variable, includes SRCS and EXTRADEPSRCS.
(.d): Depend on and use $(ALL_DEP_SRCS).
* pre.in (all-unix, all-recurse, all-postrecurse): Make each stage depend on
the previous, rather than having all-unix depend on each.

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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index ed5761cbe4d35aa3540bb3bc39181521dfc025a4..03a4c2227bf26d8b468ea8198bad8b750c2a3367 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-14  Ken Raeburn  <raeburn@mit.edu>
+
+       * lib.in ($(SUBDIROBJLISTS) and .SH/.PF variants): Depend on
+       recursion.  Use extra dummy target in case the variable is
+       empty.
+       * post.in (ALL_DEP_SRCS): New variable, includes SRCS and
+       EXTRADEPSRCS.
+       (.d): Depend on and use $(ALL_DEP_SRCS).
+       * pre.in (all-unix, all-recurse, all-postrecurse): Make each stage
+       depend on the previous, rather than having all-unix depend on
+       each.
+
 2002-07-17  Ken Raeburn  <raeburn@mit.edu>
 
        * pre.in (DYN_DEPLIB): Removed.

diff --git a/src/config/lib.in b/src/config/lib.in
index ad37262b3b45d69bc8a95576f6896725a05f0207..3d9d86a7256629ffbefca318f335287575bf5e1e 100644 (file)
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -76,6 +76,8 @@ SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
 SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
 PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
 
+dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse
+
 lib$(LIB)$(STLIBEXT): $(STOBJLISTS)
        $(RM) $@
        @echo "building static $(LIB) library"

diff --git a/src/config/post.in b/src/config/post.in
index ae4b2c84482df78b067b67d9731873dd2640d525..7a08e857bd67dab2d83496e940ce77d630004e85 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -2,14 +2,18 @@
 
 check-windows::
 
-.d: $(SRCS)
+ALL_DEP_SRCS= $(SRCS) $(EXTRADEPSRCS)
+
+# be sure to check ALL_DEP_SRCS against *what it would be if SRCS and
+# EXTRADEPSRCS are both empty*
+.d: $(ALL_DEP_SRCS)
        if test "$(srcdir)" = "." ; then \
                echo 1>&2 error: cannot build dependencies with srcdir=. ; \
                echo 1>&2 "(can't distinguish generated files from source files)" ; \
                exit 1 ; \
        fi
-       if test -n "$(SRCS)" ; then \
-               $(CC) -M $(ALL_CFLAGS) $(SRCS) > .dtmp || exit 1 ; \
+       if test "$(ALL_DEP_SRCS)" != " " ; then \
+               $(CC) -M $(ALL_CFLAGS) $(ALL_DEP_SRCS) > .dtmp || exit 1 ; \
                mv -f .dtmp .d ; \
        else \
                touch .d ; \

diff --git a/src/config/pre.in b/src/config/pre.in
index 889af44323ea6bfa5e61d84a9b3fcdb987f5ab6a..b35f4d70c3ab404de53d9a7f70a40adcd32dc41e 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -12,8 +12,8 @@ install:: install-$(WHAT)
 
 check:: check-$(WHAT)
 
-all-unix:: all-prerecurse
-all-unix:: all-recurse
+all-recurse: all-prerecurse
+all-postrecurse:: all-recurse
 all-unix:: all-postrecurse
 
 all-prerecurse::