aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2003-02-11 17:19:00 +0000
committerTom Yu <tlyu@mit.edu>2003-02-11 17:19:00 +0000
commit159c914a93b1a2623e777067c493e82e16459693 (patch)
tree9f287d0154fec74815bc51f488e7bd5d73de575c /src
parentd8ab51fb568056529fe4d763cfdafae8d2661d3c (diff)
downloadkrb5-159c914a93b1a2623e777067c493e82e16459693.zip
krb5-159c914a93b1a2623e777067c493e82e16459693.tar.gz
krb5-159c914a93b1a2623e777067c493e82e16459693.tar.bz2
Fix recursion-forcing rules to be more friendly to parallel builds
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15179 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/gssapi/ChangeLog9
-rw-r--r--src/lib/gssapi/Makefile.in10
-rw-r--r--src/lib/gssapi/generic/ChangeLog5
-rw-r--r--src/lib/gssapi/generic/Makefile.in2
4 files changed, 24 insertions, 2 deletions
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 6a4af0d..04541f1 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-11 Tom Yu <tlyu@mit.edu>
+
+ * Makefile.in ($(BUILDTOP)/include/gssapi/gssapi.h): Add
+ dependencies and cause to invoke a differently-named target in
+ subdirectory.
+ (generic/gssapi.h): Make separate rule.
+ (generic/gssapi_err_generic.h, krb5/gssapi_err_krb5.h): New rules
+ to generate these files in subdirectories as needed.
+
2003-02-10 Tom Yu <tlyu@mit.edu>
* Makefile.in ($(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h):
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 49d1f7c..cb578f2 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -70,8 +70,14 @@ clean-windows::
cd ..
@echo Making clean in gssapi
-$(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h:
- (cd generic && $(MAKE) '$$(BUILDTOP)/include/gssapi/gssapi.h' gssapi.h)
+$(BUILDTOP)/include/gssapi/gssapi.h: generic/gssapi.h
+ (cd generic && $(MAKE) gssapi-include)
+generic/gssapi.h: generic/gssapi.hin
+ (cd generic && $(MAKE) gssapi.h)
+generic/gssapi_err_generic.h: generic/gssapi_err_generic.et
+ (cd generic && $(MAKE) gssapi_err_generic.h)
+krb5/gssapi_err_krb5.h: krb5/gssapi_err_krb5.et
+ (cd krb5 && $(MAKE) gssapi_err_krb5.h)
# @lib_frag@
# @libobj_frag@
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 14712d3..b6b5534 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,5 +1,10 @@
2003-02-11 Tom Yu <tlyu@mit.edu>
+ * Makefile.in (gssapi-include): New rules to avoid coding
+ dependence on relative pathnames in parent Makefile.in.
+
+2003-02-11 Tom Yu <tlyu@mit.edu>
+
* Makefile.in: Another attempt... turns our that the "copy"
command on Windows preserves modtimes, so spurious rebuilds were
happening even with the stamp file, since the target in $(EHDRDIR)
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index db09105..c7e0176 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -23,6 +23,8 @@ HDRS= $(EHDRDIR)$(S)gssapi.h \
EHDRDIRSTAMP=$(EHDRDIR)/stamp
##DOS##EHDRDIRSTAMP=
+gssapi-include: $(EHDRDIR)$(S)gssapi.h
+
$(EHDRDIR)$(S)gssapi.h: gssapi.h $(EHDRDIRSTAMP)
$(CP) gssapi.h $@
$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h $(EHDRDIRSTAMP)