From: Tom Yu Date: Mon, 1 Oct 2007 22:22:49 +0000 (+0000) Subject: pull up r19955 from trunk X-Git-Tag: krb5-1.6.3-beta2~47 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d8635db18a09e3b42cb9cd2d07aae1f25f7f221;p=krb5.git 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 4d500ffb8..14c707d7e 100644 --- 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 467a7d6e4..c99e2620c 100644 --- 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 3149a24b2..8838bbd0d 100644 --- 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 b3d552926..d701bee89 100644 --- 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 ad39e9eb4..037546622 100644 --- 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 3ce6bbd7f..adcd1d8d0 100644 --- 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 b60d2066b..cbf77c43f 100644 --- 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 3d86d4dd3..f46848295 100644 --- 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 7525b91cd..056178bca 100644 --- 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 1f347ceef..1521cd0b4 100644 --- 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 d57a213aa..50fb46998 100644 --- 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 cc797893a..edac6eecc 100644 --- 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 6b13f8e5d..c019f3315 100644 --- 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