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

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

13 files changed, 9 insertions, 23 deletions

diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32
index c99e2620cc..3b61c66384 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 10d29625a3..21e5f78488 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 965f0d0e48..2880787d89 100644
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -35,9 +35,7 @@ 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

 

diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index de00cdb6af..f482260155 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 e739fd4e34..0320768b1a 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 8100f0eaf1..7daf5174b1 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 443f90c09a..22e605516e 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 056178bcaa..096a5ef2c6 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 e77d1c5de5..05f28532fe 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 50fb469981..0a8ede8aa3 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 edac6eecc0..f93fe68197 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 5686db5238..349263d3c7 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 30d4d7297e..cf23e05bf6 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