From: Tom Yu <tlyu@mit.edu>
Date: Mon, 1 Oct 2007 22:23:25 +0000 (+0000)
Subject: pull up r19966 from trunk
X-Git-Tag: krb5-1.6.3-beta2~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47d189f577d7a5aac8139de0406490b8311b3970;p=krb5.git

pull up r19966 from trunk

 r19966@cathode-dark-space:  jaltman | 2007-09-22 01:11:04 -0400
 ticket: 5756

 Move the removal of the vc70.pdb and vc80.pdb files to the
 global clean rule in config/Makefile.w32.  No need to replicate
 them in each individual Makefile.

ticket: 5756
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20043 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32
index c99e2620c..3b61c6638 100644
--- a/src/windows/identity/config/Makefile.w32
+++ b/src/windows/identity/config/Makefile.w32
@@ -290,7 +290,7 @@ MC2RC=$(MC) $(MCFLAGS) -h $(OBJ)\ -m 1024 -r $(OBJ)\ -x $(OBJ)\ $**
 	$(RC2RES)
 
 clean::
- 	if exist '$(OBJ)' $(RM) $(OBJ)
+ 	if exist "$(OBJ)" $(RM) "$(OBJ)"
  	if exist vc70.pdb  $(RM) vc70.pdb
         if exist vc80.pdb  $(RM) vc80.pdb
 
diff --git a/src/windows/identity/include/Makefile b/src/windows/identity/include/Makefile
index f16ae5395..70fe8c408 100644
--- a/src/windows/identity/include/Makefile
+++ b/src/windows/identity/include/Makefile
@@ -35,4 +35,4 @@ INCFILES= \
 all: $(INCFILES)
 
 clean::
-	if exist '..\obj' $(RM) $(INCFILES)
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
diff --git a/src/windows/identity/kconfig/Makefile b/src/windows/identity/kconfig/Makefile
index d701bee89..bc4667954 100644
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -35,9 +35,8 @@ OBJFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
-	if exist '..\obj' $(RM) $(INCFILES)
-	if exist 'vc70.pdb'  $(RM) vc70.pdb
-	if exist 'vc80.pdb'  $(RM) vc80.pdb
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
+
 # Tests
 
 test:: util_test
diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index 037546622..abf5efa0a 100644
--- a/src/windows/identity/kcreddb/Makefile
+++ b/src/windows/identity/kcreddb/Makefile
@@ -51,5 +51,3 @@ all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)
 
 clean::
 	if exist ..\obj $(RM) $(INCFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
diff --git a/src/windows/identity/kherr/Makefile b/src/windows/identity/kherr/Makefile
index adcd1d8d0..3972235b3 100644
--- a/src/windows/identity/kherr/Makefile
+++ b/src/windows/identity/kherr/Makefile
@@ -42,5 +42,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
 	if exist ..\obj $(RM) $(INCFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
diff --git a/src/windows/identity/kmm/Makefile b/src/windows/identity/kmm/Makefile
index cbf77c43f..6fd85ad80 100644
--- a/src/windows/identity/kmm/Makefile
+++ b/src/windows/identity/kmm/Makefile
@@ -53,5 +53,3 @@ all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)
 
 clean::
 	if exist ..\obj $(RM) $(INCFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
diff --git a/src/windows/identity/kmq/Makefile b/src/windows/identity/kmq/Makefile
index f46848295..8dcdca405 100644
--- a/src/windows/identity/kmq/Makefile
+++ b/src/windows/identity/kmq/Makefile
@@ -47,5 +47,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
 	if exist ..\obj $(RM) $(INCFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
diff --git a/src/windows/identity/nidmgrdll/Makefile b/src/windows/identity/nidmgrdll/Makefile
index 056178bca..096a5ef2c 100644
--- a/src/windows/identity/nidmgrdll/Makefile
+++ b/src/windows/identity/nidmgrdll/Makefile
@@ -123,5 +123,4 @@ all: mkdirs $(DLLFILE)
 clean::
 	if exist $(DLLFILE) $(RM) $(DLLFILE)
 	if exist $(DLLFILE).manifest $(RM) $(DLLFILE).manifest
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
+
diff --git a/src/windows/identity/plugins/common/Makefile b/src/windows/identity/plugins/common/Makefile
index 1521cd0b4..6b827dc3e 100644
--- a/src/windows/identity/plugins/common/Makefile
+++ b/src/windows/identity/plugins/common/Makefile
@@ -39,8 +39,6 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 clean::
 	if exist "$(INCDIR)" $(RM) $(INCFILES)
 	if exist "$(LIBDIR)" $(RM) $(OBJFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
 
 {}.c{$(LIBDIR)}.obj:
 	$(C2OBJ)
diff --git a/src/windows/identity/plugins/krb4/Makefile b/src/windows/identity/plugins/krb4/Makefile
index 50fb46998..0a8ede8aa 100644
--- a/src/windows/identity/plugins/krb4/Makefile
+++ b/src/windows/identity/plugins/krb4/Makefile
@@ -102,6 +102,5 @@ clean::
 !if defined(INCFILES)
 	$(RM) $(INCFILES)
 !endif
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
+
 
diff --git a/src/windows/identity/plugins/krb5/Makefile b/src/windows/identity/plugins/krb5/Makefile
index edac6eecc..f93fe6819 100644
--- a/src/windows/identity/plugins/krb5/Makefile
+++ b/src/windows/identity/plugins/krb5/Makefile
@@ -111,5 +111,4 @@ clean::
 !if defined(INCFILES)
 	$(RM) $(INCFILES)
 !endif
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb
+
diff --git a/src/windows/identity/uilib/Makefile b/src/windows/identity/uilib/Makefile
index 92c0aa15a..5c019b454 100644
--- a/src/windows/identity/uilib/Makefile
+++ b/src/windows/identity/uilib/Makefile
@@ -63,3 +63,6 @@ $(OBJ)\acceldef.c: accel.csv acceldef.cfg
 
 all: mkdirs $(INCFILES) $(UIDLLOBJFILES)
 
+clean::
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
+
diff --git a/src/windows/identity/util/Makefile b/src/windows/identity/util/Makefile
index c019f3315..07202869f 100644
--- a/src/windows/identity/util/Makefile
+++ b/src/windows/identity/util/Makefile
@@ -47,5 +47,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
 	if exist ..\obj $(RM) $(INCFILES)
-	if exist vc70.pdb  $(RM) vc70.pdb
-	if exist vc80.pdb  $(RM) vc80.pdb