More existence tests; path update

Modify remainder of Makefiles that were sensitive to identity/obj or other cleaned files not being present.

Update util/et/Makefile.in to look for com_err.h in src/include, not src/include/src.

ticket: 5457
tags: pullup

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

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index b7aa747a8a460162d5b58042e2deb991a40ae775..bcb91561630fd08eff686e2de5eb281d4bc204b1 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -70,7 +70,7 @@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 SHLIB_DIRS=-L$(TOPLIBD)
 
-COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
+COM_ERR_HDR=$(BUILDTOP)$(S)include\com_err.h
 
 all-windows:: $(COM_ERR_HDR)
 

diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile
index 321d02fa18fdf73a0a5249eecd11213fdc29f1f8..39b20a5aa46cc676b34276924959649b66d44dae 100644 (file)
--- a/src/windows/identity/doc/Makefile
+++ b/src/windows/identity/doc/Makefile
@@ -65,4 +65,4 @@ CHM_FILE = "$(DOCDIR)\netiddev.chm"
 \r
 clean::\r
        if exist "$(DOCDIR)/html" $(RMDIR) /s /q "$(DOCDIR)\html"\r
-       $(RM) "$(DOCDIR)\*.*"\r
+       if exist "$(DOCDIR)" $(RM) "$(DOCDIR)\*.*"\r

diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile
index fa76b026cae84e7b09be669b49cd61cc70f68924..2cfe823a8b420a635375a988ebbff587da078db5 100644 (file)
--- a/src/windows/identity/help/Makefile
+++ b/src/windows/identity/help/Makefile
@@ -36,4 +36,4 @@ $(CHMFILE): netidmgr.hhp
        $(CP) netidmgr.chm $(CHMFILE)\r
 \r
 clean::\r
-       $(RM) $(CHMFILE)
\ No newline at end of file
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file

diff --git a/src/windows/identity/kconfig/Makefile b/src/windows/identity/kconfig/Makefile
index 26619c011c3cafa126ff741de50877f58656752c..98e9c25b4788b033c0e3269694e8efe3f67c1c77 100644 (file)
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -35,8 +35,7 @@ OBJFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
-\r
+       if exist '..\obj' $(RM) $(INCFILES)\r
 # Tests\r
 \r
 test:: util_test\r

diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index 24cc0339a2b1f6dec00379804527b7db46b1a23c..579e4544af2d11b9309b6028468a8c1d78cb556a 100644 (file)
--- a/src/windows/identity/kcreddb/Makefile
+++ b/src/windows/identity/kcreddb/Makefile
@@ -49,4 +49,4 @@ $(OBJ)\kcredres.res: lang\en_us\kcredres.rc
 all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file

diff --git a/src/windows/identity/kherr/Makefile b/src/windows/identity/kherr/Makefile
index 84f9da5baa72f4365db5023ec67d46423f0af4aa..26021d4654a0c4b09bd7c6f560fe2de99c3fd781 100644 (file)
--- a/src/windows/identity/kherr/Makefile
+++ b/src/windows/identity/kherr/Makefile
@@ -40,4 +40,4 @@ SDKLIBFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file

diff --git a/src/windows/identity/kmm/Makefile b/src/windows/identity/kmm/Makefile
index 6135cdc4f0cabfddf4aa541b6643293cdc526aaf..6a3edfa855e6d132fc7caddd8e837895ba8013ad 100644 (file)
--- a/src/windows/identity/kmm/Makefile
+++ b/src/windows/identity/kmm/Makefile
@@ -51,4 +51,4 @@ $(OBJ)\kmm_msgs.rc: lang\kmm_msgs.mc
 all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file

diff --git a/src/windows/identity/kmq/Makefile b/src/windows/identity/kmq/Makefile
index 1f11e0fe42da05f27320f7fda73d1aed6698cdbb..20f65b1a6929b50c58323382d13a842b048e98b4 100644 (file)
--- a/src/windows/identity/kmq/Makefile
+++ b/src/windows/identity/kmq/Makefile
@@ -45,4 +45,4 @@ $(OBJ)\kmqconfig.c: kmqconfig.csv $(CONFDIR)\csvschema.cfg
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file

diff --git a/src/windows/identity/nidmgrdll/Makefile b/src/windows/identity/nidmgrdll/Makefile
index 324097ef3f192924583bf3b18ce3a9a0d90b7c51..7525b91cd39a46a7fe79ac383ed7270e713149f2 100644 (file)
--- a/src/windows/identity/nidmgrdll/Makefile
+++ b/src/windows/identity/nidmgrdll/Makefile
@@ -120,5 +120,5 @@ $(DLLFILE): $(OBJFILES) $(RESFILES)
 all: mkdirs $(DLLFILE)
 
 clean::
-       $(RM) $(DLLFILE)
-       $(RM) $(DLLFILE).manifest
+       if exist '$(DLLFILE)' $(RM) $(DLLFILE)
+       if exist '$(DLLFILE).manifest' $(RM) $(DLLFILE).manifest

diff --git a/src/windows/identity/plugins/common/Makefile b/src/windows/identity/plugins/common/Makefile
index 5107edca4685ed79822bc0862c0685ec20905261..4e97c663824f199107b29fa63b3ab8ec69eab30d 100644 (file)
--- a/src/windows/identity/plugins/common/Makefile
+++ b/src/windows/identity/plugins/common/Makefile
@@ -36,8 +36,8 @@ OBJFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
-       $(RM) $(OBJFILES)\r
+       if exist '..\..\obj' $(RM) $(INCFILES)\r
+       if exist '..\..\obj' $(RM) $(OBJFILES)\r
 \r
 {}.c{$(LIBDIR)}.obj:\r
        $(C2OBJ)\r

diff --git a/src/windows/identity/util/Makefile b/src/windows/identity/util/Makefile
index 9d1cad2f0f6849fee7d13ad50dc3e5384866dae2..97aff0e6dafbd209c496cc9dc579a1e4b5a4f5a4 100644 (file)
--- a/src/windows/identity/util/Makefile
+++ b/src/windows/identity/util/Makefile
@@ -45,4 +45,4 @@ SDKLIBFILES=
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       $(RM) $(INCFILES)\r
+       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file