ntmakefile-auth-headers-20040618

break up auth build step into two parts to avoid
circular dependency in the build process

diff --git a/src/NTMakefile b/src/NTMakefile
index a949a72e4ce7245ba570d694b059486b0f16604e..62c19b334551c3afdd01eed1a185f5fd5809a78e 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -197,14 +197,14 @@ cm_headers: libacl_headers
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
-auth: cm_headers
+auth_headers: cm_headers
      echo ***** $@
-       $(DOCD) $(SRC)\$@
-       $(CD) $(SRC)\$@
-       $(NTMAKE)
+       $(DOCD) $(SRC)\auth
+       $(CD) $(SRC)\auth
+       $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-afsdobjs: auth
+afsdobjs: auth_headers
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\afsd
        $(CD) $(SRC)\WINNT\afsd
@@ -218,7 +218,14 @@ sys: afsdobjs
        $(NTMAKE)
        $(CD) ..\..
 
-ubik: sys
+auth: sys
+     echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..     
+
+ubik: auth
      echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@

diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile
index 87bd403493248e943f8ce167dccec6c73871daa4..0658ce94914525fc910e56cacb3c2d3a62579f31 100644 (file)
--- a/src/auth/NTMakefile
+++ b/src/auth/NTMakefile
@@ -108,7 +108,9 @@ ktc_errors.c auth.h: ktc_errors.et auth.p.h
        $(DEL) auth.h ktc_errors.c
        $(COMPILE_ET) ktc_errors.et -h auth
 
-install: $(INCFILES) $(AFSAUTH_LIBFILE) $(OUT)\setkey.exe # $(COPYAUTH_EXEFILE) $(AFSAUTH_KRB_LIBFILE)
+install_headers: $(INCFILES)
+
+install: $(AFSAUTH_LIBFILE) $(OUT)\setkey.exe # $(COPYAUTH_EXEFILE) $(AFSAUTH_KRB_LIBFILE)
 
 install9x: install