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

diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32
index c99e2620cc8b5d16fa86f4fd6c7ce99bb837114e..3b61c66384b0430777860fcb97ad307b0d59c000 100644 (file)
--- 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 10d29625a3d51d75cd2758b6e44365b8ea510986..21e5f78488de46d91121196842cfca1acd8be75a 100644 (file)
--- a/src/windows/identity/include/Makefile
+++ b/src/windows/identity/include/Makefile
@@ -35,4 +35,4 @@ INCFILES= \
 all: $(INCFILES)\r
 \r
 clean::\r
-       if exist '..\obj' $(RM) $(INCFILES)\r
+       if exist "$(INCDIR)" $(RM) $(INCFILES)\r

diff --git a/src/windows/identity/kconfig/Makefile b/src/windows/identity/kconfig/Makefile
index 965f0d0e483b3314f347b11e694369afbcb219f8..2880787d89688e4297ff696ec2b41453ed0220ef 100644 (file)
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -35,9 +35,7 @@ OBJFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)\r
 \r
 clean::\r
-       if exist '..\obj' $(RM) $(INCFILES)\r
-        if exist 'vc70.pdb'  $(RM) vc70.pdb\r
-        if exist 'vc80.pdb'  $(RM) vc80.pdb\r
+       if exist "$(INCDIR)" $(RM) $(INCFILES)\r
 \r
 # Tests\r
 \r

diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index de00cdb6af11ccc75518a5eab095fa01e1ec7266..f482260155f7fa4194984996f2609d78ed6fe0b1 100644 (file)
--- a/src/windows/identity/kcreddb/Makefile
+++ b/src/windows/identity/kcreddb/Makefile
@@ -51,5 +51,3 @@ all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)
 \r
 clean::\r
        if exist ..\obj $(RM) $(INCFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r

diff --git a/src/windows/identity/kherr/Makefile b/src/windows/identity/kherr/Makefile
index e739fd4e344287d576237a1694e9079cb8490dfd..0320768b1ada8a3eb04467acc04c76a60bd2fe07 100644 (file)
--- a/src/windows/identity/kherr/Makefile
+++ b/src/windows/identity/kherr/Makefile
@@ -42,5 +42,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 \r
 clean::\r
        if exist ..\obj $(RM) $(INCFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r

diff --git a/src/windows/identity/kmm/Makefile b/src/windows/identity/kmm/Makefile
index 8100f0eaf184fafd59950d75655a2fe2da8c814e..7daf5174b16c4f4642ff1e041593897c54a2853f 100644 (file)
--- a/src/windows/identity/kmm/Makefile
+++ b/src/windows/identity/kmm/Makefile
@@ -53,5 +53,3 @@ all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)
 \r
 clean::\r
        if exist ..\obj $(RM) $(INCFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r

diff --git a/src/windows/identity/kmq/Makefile b/src/windows/identity/kmq/Makefile
index 443f90c09a9f97e57cd2c8c8c54097d7e8456e54..22e605516eec6174c1151af7937e9a34ef6e843b 100644 (file)
--- a/src/windows/identity/kmq/Makefile
+++ b/src/windows/identity/kmq/Makefile
@@ -47,5 +47,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 \r
 clean::\r
        if exist ..\obj $(RM) $(INCFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r

diff --git a/src/windows/identity/nidmgrdll/Makefile b/src/windows/identity/nidmgrdll/Makefile
index 056178bcaa4e84d61ac73c0bf97c3c239b649003..096a5ef2c649b85e3eef7e3d5955f45371421f23 100644 (file)
--- 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 e77d1c5de595669069e9611b8b4bd27830ef4235..05f28532fe8f3eaf3f1377bfd80d7b245d7745f0 100644 (file)
--- a/src/windows/identity/plugins/common/Makefile
+++ b/src/windows/identity/plugins/common/Makefile
@@ -39,8 +39,6 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 clean::\r
        if exist "$(INCDIR)" $(RM) $(INCFILES)\r
        if exist "$(LIBDIR)" $(RM) $(OBJFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r
 \r
 {}.c{$(LIBDIR)}.obj:\r
        $(C2OBJ)\r

diff --git a/src/windows/identity/plugins/krb4/Makefile b/src/windows/identity/plugins/krb4/Makefile
index 50fb469981db51f43607841179c7693f342a6eaf..0a8ede8aa35a5ea3afc435fcaa2e25b4ddacbaf5 100644 (file)
--- 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 edac6eecc0eb73f88f09d77cef1bae404052f89b..f93fe681978c35df26ee072aaa90489420a3fa45 100644 (file)
--- 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 5686db52384b881dfcb525b578d38305d13f6ed9..349263d3c7d7eb165b805d0d62423bcce19ae4ee 100644 (file)
--- a/src/windows/identity/uilib/Makefile
+++ b/src/windows/identity/uilib/Makefile
@@ -63,3 +63,6 @@ $(OBJ)\acceldef.c: accel.csv acceldef.cfg
 \r
 all: mkdirs $(INCFILES) $(UIDLLOBJFILES)\r
 \r
+clean::\r
+       if exist "$(INCDIR)" $(RM) $(INCFILES)\r
+\r

diff --git a/src/windows/identity/util/Makefile b/src/windows/identity/util/Makefile
index 30d4d7297ec71f2766cc6df59615c5984c27abcb..cf23e05bf623c3dc744b5d3e755cb18668ac3d41 100644 (file)
--- a/src/windows/identity/util/Makefile
+++ b/src/windows/identity/util/Makefile
@@ -47,5 +47,3 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 \r
 clean::\r
        if exist ..\obj $(RM) $(INCFILES)\r
-       if exist vc70.pdb  $(RM) vc70.pdb\r
-       if exist vc80.pdb  $(RM) vc80.pdb\r