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 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 f16ae5395f570c737a14d37c631f995db20c90f3..70fe8c4081a43f543a86a1d6775f449ff7cdd92c 100644 (file)
--- 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 d701bee89992d7e7de87a8699079152a7f96f0de..bc46679546047bdd042794b8902c3458c1b7b199 100644 (file)
--- 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 037546622e938935ccd0bdf4ea1a55e612441354..abf5efa0af68a8260b5e7b5238d5257b0e257050 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)
 
 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 adcd1d8d0cd6409a84e5643d9358c5a14a792b82..3972235b382489d00ea348c710a083c209d9163e 100644 (file)
--- 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 cbf77c43fc6aa1dd005ea697fb3208f093972b45..6fd85ad80c85726b331e2de029ce61f4b72865d4 100644 (file)
--- 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 f46848295d9fa8ea053aa10ba20bf7f42e093cef..8dcdca405fa8dfac04e2b65abffeb65b29706ad6 100644 (file)
--- 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 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 1521cd0b4ee2e8f892b5aa72ded3d65ba9e549ab..6b827dc3e4684c4ccb0ce256d3d71a4ff360b88a 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::
        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 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 92c0aa15a5287cd73e6aed9fff9b1f958960e1c5..5c019b4544e4242cbe3cc576f4267737aadfa42f 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
 
 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 c019f33156450a405a70aeaa04c5e7fbb38e9daf..07202869f5260374be0358725374efc4c0b5fc05 100644 (file)
--- 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