pull up r19955 from trunk

 r19955@cathode-dark-space:  jaltman | 2007-09-18 17:08:01 -0400
 ticket: new
 subject: Windows\Identity Makefile "clean" more
 component: windows

 make sure that we clean up vc70.pdb, vc80.pdb, and
 temporary files generated during the build process.

ticket: 5756

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

diff --git a/src/windows/identity/config/Makefile.w2k b/src/windows/identity/config/Makefile.w2k
index 4d500ffb83e2438997946d3bd7bf426fa0910988..14c707d7e1123791fa5f6770d31335b42df2d4b9 100644 (file)
--- a/src/windows/identity/config/Makefile.w2k
+++ b/src/windows/identity/config/Makefile.w2k
@@ -280,6 +280,8 @@ clean::
 !if exist($(OBJ))
        $(RM) $(OBJ)\
 !endif
+       if exist vc70.pdb $(RM) vc70.pdb
+       if exist vc80.pdb $(RM) vc80.pdb
 
 test::
 

diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32
index 467a7d6e4057ec0915543475eb67cb079f6271f0..c99e2620cc8b5d16fa86f4fd6c7ce99bb837114e 100644 (file)
--- a/src/windows/identity/config/Makefile.w32
+++ b/src/windows/identity/config/Makefile.w32
@@ -290,9 +290,9 @@ MC2RC=$(MC) $(MCFLAGS) -h $(OBJ)\ -m 1024 -r $(OBJ)\ -x $(OBJ)\ $**
        $(RC2RES)
 
 clean::
-!if exist($(OBJ))
-       $(RM) $(OBJ)\
-!endif
+       if exist '$(OBJ)' $(RM) $(OBJ)
+       if exist vc70.pdb  $(RM) vc70.pdb
+        if exist vc80.pdb  $(RM) vc80.pdb
 
 test::
 

diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile
index 3149a24b29bf7ea029864c0fccda433a9e5b42d4..8838bbd0de7eb854b32540d11583397d1cb31426 100644 (file)
--- a/src/windows/identity/help/Makefile
+++ b/src/windows/identity/help/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -36,4 +37,5 @@ $(CHMFILE): netidmgr.hhp
        $(CP) netidmgr.chm $(CHMFILE)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
+       if exist ..\obj $(RM) $(INCFILES)
+       if exist netidmgr.chm $(RM) netidmgr.chm

diff --git a/src/windows/identity/kconfig/Makefile b/src/windows/identity/kconfig/Makefile
index b3d55292665c09b447ca0ce96d94f01b1609ea07..d701bee89992d7e7de87a8699079152a7f96f0de 100644 (file)
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -36,6 +36,8 @@ all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
        if exist '..\obj' $(RM) $(INCFILES)
+       if exist 'vc70.pdb'  $(RM) vc70.pdb
+       if exist 'vc80.pdb'  $(RM) vc80.pdb
 # Tests
 
 test:: util_test

diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index ad39e9eb4535d70cb4ad1a12675e08cff1e7a467..037546622e938935ccd0bdf4ea1a55e612441354 100644 (file)
--- a/src/windows/identity/kcreddb/Makefile
+++ b/src/windows/identity/kcreddb/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -49,4 +50,6 @@ $(OBJ)\kcredres.res: lang\en_us\kcredres.rc
 all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file
+       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 3ce6bbd7fcfb5273746bdd0b883a37a8be162399..adcd1d8d0cd6409a84e5643d9358c5a14a792b82 100644 (file)
--- a/src/windows/identity/kherr/Makefile
+++ b/src/windows/identity/kherr/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -40,4 +41,6 @@ SDKLIBFILES= \
 all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file
+       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 b60d2066b0faec3509c40230cb07b1149e241de3..cbf77c43fc6aa1dd005ea697fb3208f093972b45 100644 (file)
--- a/src/windows/identity/kmm/Makefile
+++ b/src/windows/identity/kmm/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -51,4 +52,6 @@ $(OBJ)\kmm_msgs.rc: lang\kmm_msgs.mc
 all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file
+       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 3d86d4dd3feb65bdde8dac9827f69c62b7dda00f..f46848295d9fa8ea053aa10ba20bf7f42e093cef 100644 (file)
--- a/src/windows/identity/kmq/Makefile
+++ b/src/windows/identity/kmq/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -45,4 +46,6 @@ $(OBJ)\kmqconfig.c: kmqconfig.csv $(CONFDIR)\csvschema.cfg
 all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file
+       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 7525b91cd39a46a7fe79ac383ed7270e713149f2..056178bcaa4e84d61ac73c0bf97c3c239b649003 100644 (file)
--- a/src/windows/identity/nidmgrdll/Makefile
+++ b/src/windows/identity/nidmgrdll/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -120,5 +121,7 @@ $(DLLFILE): $(OBJFILES) $(RESFILES)
 all: mkdirs $(DLLFILE)
 
 clean::
-       if exist '$(DLLFILE)' $(RM) $(DLLFILE)
-       if exist '$(DLLFILE).manifest' $(RM) $(DLLFILE).manifest
+       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 1f347ceef0bf857424ffd5fb873ea0c1a36b644d..1521cd0b4ee2e8f892b5aa72ded3d65ba9e549ab 100644 (file)
--- a/src/windows/identity/plugins/common/Makefile
+++ b/src/windows/identity/plugins/common/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -38,6 +39,8 @@ 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 d57a213aafedf8fade267ac6d2be6b360154ddb9..50fb469981db51f43607841179c7693f342a6eaf 100644 (file)
--- a/src/windows/identity/plugins/krb4/Makefile
+++ b/src/windows/identity/plugins/krb4/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -101,3 +102,6 @@ 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 cc797893aa8403241f1edd6cd802bec5ab45afe2..edac6eecc0eb73f88f09d77cef1bae404052f89b 100644 (file)
--- a/src/windows/identity/plugins/krb5/Makefile
+++ b/src/windows/identity/plugins/krb5/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -110,3 +111,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/util/Makefile b/src/windows/identity/util/Makefile
index 6b13f8e5dc667a681f00e28dbc29c0c0c4942dfd..c019f33156450a405a70aeaa04c5e7fbb38e9daf 100644 (file)
--- a/src/windows/identity/util/Makefile
+++ b/src/windows/identity/util/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -45,4 +46,6 @@ SDKLIBFILES=
 all: mkdirs $(INCFILES) $(OBJFILES)
 
 clean::
-       if exist '..\obj' $(RM) $(INCFILES)
\ No newline at end of file
+       if exist ..\obj $(RM) $(INCFILES)
+       if exist vc70.pdb  $(RM) vc70.pdb
+       if exist vc80.pdb  $(RM) vc80.pdb