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

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 6a4af0d8796ed3d0b4b813bb07b0fbdb7f0d1e77..04541f15d61c3959c76c664209108531791ad24d 100644 (file)
--- 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 49d1f7c0772dacfc7bb3a0505bb9a759b878bbef..cb578f2899f68755fe45e00201449d261dfa4ff0 100644 (file)
--- 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 14712d3038200753868b5b4dbf11bcb26ee2bc75..b6b55340abe2adfbbc28c67b6560a9e47587e762 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+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"

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index db09105fc807430d1943b3113a2516662e2bcbad..c7e01765e6bb750224c8f48f75f2bfc9dfbfdaf4 100644 (file)
--- 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)