diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2007-03-02 21:44:07 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2007-03-02 21:44:07 +0000 |
| commit | 23b96366d567c5032e7500a82676a315ff3f0834 (patch) | |
| tree | 2e65a6f52b507fbcb22945e0efd74d20fc35b976 /src/windows | |
| parent | f26a3212de48d3746036618cd10ea4db3a363988 (diff) | |
| download | krb5-23b96366d567c5032e7500a82676a315ff3f0834.tar.gz krb5-23b96366d567c5032e7500a82676a315ff3f0834.tar.xz krb5-23b96366d567c5032e7500a82676a315ff3f0834.zip | |
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
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/identity/doc/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/help/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/kconfig/Makefile | 3 | ||||
| -rw-r--r-- | src/windows/identity/kcreddb/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/kherr/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/kmm/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/kmq/Makefile | 2 | ||||
| -rw-r--r-- | src/windows/identity/nidmgrdll/Makefile | 4 | ||||
| -rw-r--r-- | src/windows/identity/plugins/common/Makefile | 4 | ||||
| -rw-r--r-- | src/windows/identity/util/Makefile | 2 |
10 files changed, 12 insertions, 13 deletions
diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile index 321d02fa1..39b20a5aa 100644 --- a/src/windows/identity/doc/Makefile +++ b/src/windows/identity/doc/Makefile @@ -65,4 +65,4 @@ CHM_FILE = "$(DOCDIR)\netiddev.chm" clean::
if exist "$(DOCDIR)/html" $(RMDIR) /s /q "$(DOCDIR)\html"
- $(RM) "$(DOCDIR)\*.*"
+ if exist "$(DOCDIR)" $(RM) "$(DOCDIR)\*.*"
diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile index fa76b026c..2cfe823a8 100644 --- a/src/windows/identity/help/Makefile +++ b/src/windows/identity/help/Makefile @@ -36,4 +36,4 @@ $(CHMFILE): netidmgr.hhp $(CP) netidmgr.chm $(CHMFILE)
clean::
- $(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 26619c011..98e9c25b4 100644 --- a/src/windows/identity/kconfig/Makefile +++ b/src/windows/identity/kconfig/Makefile @@ -35,8 +35,7 @@ OBJFILES= \ all: mkdirs $(INCFILES) $(OBJFILES)
clean::
- $(RM) $(INCFILES)
-
+ if exist '..\obj' $(RM) $(INCFILES)
# Tests
test:: util_test
diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile index 24cc0339a..579e4544a 100644 --- 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)
clean::
- $(RM) $(INCFILES)
+ 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 84f9da5ba..26021d465 100644 --- a/src/windows/identity/kherr/Makefile +++ b/src/windows/identity/kherr/Makefile @@ -40,4 +40,4 @@ SDKLIBFILES= \ all: mkdirs $(INCFILES) $(OBJFILES)
clean::
- $(RM) $(INCFILES)
+ 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 6135cdc4f..6a3edfa85 100644 --- 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)
clean::
- $(RM) $(INCFILES)
+ 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 1f11e0fe4..20f65b1a6 100644 --- 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)
clean::
- $(RM) $(INCFILES)
+ 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 324097ef3..7525b91cd 100644 --- 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 5107edca4..4e97c6638 100644 --- a/src/windows/identity/plugins/common/Makefile +++ b/src/windows/identity/plugins/common/Makefile @@ -36,8 +36,8 @@ OBJFILES= \ all: mkdirs $(INCFILES) $(OBJFILES)
clean::
- $(RM) $(INCFILES)
- $(RM) $(OBJFILES)
+ if exist '..\..\obj' $(RM) $(INCFILES)
+ if exist '..\..\obj' $(RM) $(OBJFILES)
{}.c{$(LIBDIR)}.obj:
$(C2OBJ)
diff --git a/src/windows/identity/util/Makefile b/src/windows/identity/util/Makefile index 9d1cad2f0..97aff0e6d 100644 --- a/src/windows/identity/util/Makefile +++ b/src/windows/identity/util/Makefile @@ -45,4 +45,4 @@ SDKLIBFILES= all: mkdirs $(INCFILES) $(OBJFILES)
clean::
- $(RM) $(INCFILES)
+ if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file |