DEVEL15-windows-netidmgr-plugin-20061016

fixup build dependencies for afsp_version.h

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

fixup copyrights

(cherry picked from commit 5aa0347678c472d21b99af516c64578c4af41ea9)

diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index ba846733ff73c30f5280c7c910651e9793d14602..6080e5cdade900e39f8fb9a795e60294c0d1d369 100644 (file)
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -37,6 +37,8 @@ AFSPLUGIN_VERLIST=$(AFSPLUGIN_VERSION_MAJOR),$(AFSPLUGIN_VERSION_MINOR),$(AFSPLU
 # short form version numbers
 TAFSPLUGIN_VERSION=$(AFSPLUGIN_VERSION_MAJOR).$(AFSPLUGIN_VERSION_MINOR).$(AFSPLUGIN_VERSION_PATCH)
 
+!INCLUDE afsp_version.h.in
+
 # Directories
 
 EXEDIR = $(DESTDIR)\root.client\usr\vice\etc
@@ -75,6 +77,7 @@ DLLFILE=$(EXEDIR)\afscred.dll
 LIBFILE=$(LIBFILEDIR)\afscred.lib
 
 INCFILES=                              \
+       afsp_version.h                  \
        $(INCFILEDIR)\afspext.h         \
        $(INCFILEDIR)\afsp_version.h
 
@@ -136,8 +139,6 @@ $(OUT)\dynimport.obj: dynimport.c
 $(OUT)\krb5common.obj: krb5common.c
        $(PC2OBJ)
 
-!include afsp_version.h.in
-
 $(DLLFILE): $(OBJFILES) $(VERRESFILE)
        $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES)
        $(_VC_MANIFEST_EMBED_DLL)
@@ -175,9 +176,8 @@ $(OUT)\langres_$(LANG).res: lang\$(LANG)\langres.rc
 # End language block
 
 clean::
-!ifdef INCFILES
        $(DEL) $(INCFILES)
-!endif
+       $(DEL) *.pdb
        $(CD) help
        $(MAKECMD) /f NTMakefile clean
        $(CD) ..

diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
index 1fbf84b8dbe22f21978fe3bd4f3e07d5d5515a68..f121007a73f2884432d72139fb09abc5c9c023be 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsconfigdlg.c
+++ b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afscred.h b/src/WINNT/netidmgr_plugin/afscred.h
index 3dad7ab40542f9b678667866c4a4b13e7171ca25..dbf522a8cedf36971d9f2f44b237830b9345ed88 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afscred.h
+++ b/src/WINNT/netidmgr_plugin/afscred.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsext.c b/src/WINNT/netidmgr_plugin/afsext.c
index 5a3e5d3b2dcae0c8ec30f0ee678eea7a9f475db7..2e07c313548ac02e32c7658f0c1a50aea3ba386b 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsext.c
+++ b/src/WINNT/netidmgr_plugin/afsext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c
index f27f323d2a27e11fab3883f0264271698872a51d..421fc24df9500cc76dc6e446368fc1b432260ff0 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsfuncs.c
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.h b/src/WINNT/netidmgr_plugin/afsfuncs.h
index 6a163cd707702f910acae6ed8ca21e113faa5526..5f6ee3fb4b219ee1d4b56f12023f39790312e7ee 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsfuncs.h
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afshelp.c b/src/WINNT/netidmgr_plugin/afshelp.c
index e143c067cad41f23dc3870fbb0d30ca7a605320d..30a7cc619554acdd09ac38ec2bef9d735934e752 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afshelp.c
+++ b/src/WINNT/netidmgr_plugin/afshelp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.c b/src/WINNT/netidmgr_plugin/afsnewcreds.c
index e35c347752779427ab48f1151a2aa973240e0339..074d866258d40b50332223cbf5418928f629f8bb 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.c
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.h b/src/WINNT/netidmgr_plugin/afsnewcreds.h
index cc760cd27497b42b771f8538d9f7d69e1add98ee..091caf107d86452d7967706f1ad2f079e1b08214 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.h
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsp_version.h.in b/src/WINNT/netidmgr_plugin/afsp_version.h.in
index a15043ea5dd8a7ea16d6d26658f81be49c8d0bf1..9e9b0f434fe7c9822cab244619bb3b471c0bbad4 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsp_version.h.in
+++ b/src/WINNT/netidmgr_plugin/afsp_version.h.in
@@ -1,6 +1,7 @@
-afsp_version.h: NTMakefile afsp_version.h.in
-        $(COPY) << $@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+
+afsp_version.h: afsp_version.h.in
+       $(COPY) << $@
+/* Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -38,3 +39,4 @@ afsp_version.h: NTMakefile afsp_version.h.in
 
 #endif
 <<
+

diff --git a/src/WINNT/netidmgr_plugin/afspext.h b/src/WINNT/netidmgr_plugin/afspext.h
index cfe802b2b9d8cad13be1f70937541e2b32b56e64..d30bffbba0142e55a0c1ffabe3a428ce0a49ef8f 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afspext.h
+++ b/src/WINNT/netidmgr_plugin/afspext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsplugin.c b/src/WINNT/netidmgr_plugin/afsplugin.c
index 3dd47e1ff537ca1cc5f671bab0884886dd746a7f..7080ef38c84b88e78ec1ebd975d481316600f13b 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsplugin.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/afsplugin_custom.c b/src/WINNT/netidmgr_plugin/afsplugin_custom.c
index d32b8784bc9b339fe6062ee5abb97604c83dcfca..3bf583b3025fac2b75b28a757c3cc52e228246e0 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsplugin_custom.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin_custom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/main.c b/src/WINNT/netidmgr_plugin/main.c
index e3569e5aa32358f94861db1e8aa8cf000465d2c1..9164590345792dcfd1fbcbf6e1a1a18b724d7c15 100644 (file)
--- a/src/WINNT/netidmgr_plugin/main.c
+++ b/src/WINNT/netidmgr_plugin/main.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* 
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/params.h b/src/WINNT/netidmgr_plugin/params.h
index f0a5609195da248fc8afb6537e87ad586858abce..63eafd7f1eeea1ce522fe4b28adf4afc147ae5e0 100644 (file)
--- a/src/WINNT/netidmgr_plugin/params.h
+++ b/src/WINNT/netidmgr_plugin/params.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Massachusetts Institute of Technology
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation

diff --git a/src/WINNT/netidmgr_plugin/version.rc b/src/WINNT/netidmgr_plugin/version.rc
index 3c9e4f5dcb3b7091ffb0b28c78f7a004aa6503be..4297611b091ef265c5156e662ac8852315cae724 100644 (file)
--- a/src/WINNT/netidmgr_plugin/version.rc
+++ b/src/WINNT/netidmgr_plugin/version.rc
@@ -1,4 +1,5 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* 
+ * Copyright (c) 2005,2006 Secure Endpoints Inc.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation