From 9a8b4bbd934d4490f3bc9df127d1ce3e1ae67268 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@mit.edu>
Date: Fri, 16 Jul 2004 04:56:46 +0000
Subject: [PATCH] ntmakefile-20040715

Updated makefiles to avoid macro redefinitions and add new files
to src/WINNT/afsd
---
 src/WINNT/afsd/NTMakefile        | 13 ++++++++++++-
 src/WINNT/install/wix/NTMakefile |  2 +-
 src/bucoord/NTMakefile           |  1 +
 src/budb/NTMakefile              |  1 +
 src/butc/NTMakefile              |  1 +
 src/libafsrpc/NTMakefile         |  1 +
 src/rx/test/NTMakefile           | 19 +++++++++++++++----
 src/tbutc/NTMakefile             |  2 +-
 8 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index de4243b21..210c7a298 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -210,6 +210,7 @@ LOGON_DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\afslogon.dll
 
 LOGON_DLLOBJS =\
 	$(OUT)\afslogon.obj \
+    $(OUT)\logon_ad.obj \
 	$(OUT)\afslogon.res
 
 LOGON_DLLLIBS =\
@@ -219,8 +220,18 @@ LOGON_DLLLIBS =\
     $(DESTDIR)\lib\afsdes.lib \
     $(AFSKFWLIB)
 
+LOGON_DLLSDKLIBS =\
+	dnsapi.lib \
+	advapi32.lib \
+	secur32.lib \
+	strsafe.lib \
+	oleaut32.lib \
+	ole32.lib \
+	adsiid.lib \
+	activeds.lib
+
 $(LOGON_DLLFILE): $(LOGON_DLLOBJS) $(LOGON_DLLLIBS)
-	$(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def dnsapi.lib secur32.lib
+	$(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def $(LOGON_DLLSDKLIBS)
 	$(DLLPREP)
 	$(COPY) $*.lib $(DESTDIR)\lib
 	$(DEL) $*.lib $*.exp
diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index ce69def93..8b2c50145 100644
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -57,7 +57,7 @@ $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
 		-dCellDbFile=CellServDB \
 		-v0 \
 		-w0 \
-		openafs.wxs
+        $(AFSDEV_AUXWIXDEFINES)	openafs.wxs
 
 # Cleanup
 clean::
diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 71bf0ceab..95af55bba 100644
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=bucoord
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 
diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile
index e9b716082..7d1611021 100644
--- a/src/budb/NTMakefile
+++ b/src/budb/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=budb
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 
diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile
index a644f9ce2..9622f5e95 100644
--- a/src/butc/NTMakefile
+++ b/src/butc/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=butc
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 
diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile
index 32ec9c070..52ff80e66 100644
--- a/src/libafsrpc/NTMakefile
+++ b/src/libafsrpc/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=libafsrpc
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DNOGDI -DWIN32_LEAN_AND_MEAN
 !include ..\config\NTMakefile.$(SYS_NAME)
 !include ..\config\NTMakefile.version
 
diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile
index c058e129d..9e255640c 100644
--- a/src/rx/test/NTMakefile
+++ b/src/rx/test/NTMakefile
@@ -5,7 +5,7 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = -DRXDEBUG
+AFSDEV_AUXCDEFINES = -DRXDEBUG -DAFS_PTHREAD_ENV
 
 RELDIR=rx\test
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
@@ -20,16 +20,27 @@ LIBS = \
 
 RXTESTOBJS = $(OUT)\testclient.obj $(OUT)\testserver.obj
 
-
 tests: $(OUT)\testclient.exe $(OUT)\testserver.exe $(OUT)\tableGen.exe $(OUT)\generator.exe
 
-testclient.exe: $(OUT)\testclient.obj $(LIBS)
+$(OUT)\testclient.exe: $(OUT)\testclient.obj $(LIBS)
+	$(EXECONLINK)
+
+$(OUT)\testserver.exe: $(OUT)\testserver.obj $(LIBS)
 	$(EXECONLINK)
 
-testserver.exe: $(OUT)\testserver.obj $(LIBS)
+$(OUT)\tableGen.exe: $(OUT)\tableGen.obj $(LIBS)
+	$(EXECONLINK)
+
+$(OUT)\generator.exe: $(OUT)\generator.obj $(LIBS)
 	$(EXECONLINK)
 
 $(RXTESTOBJS): ..\rx_clock.h ..\rx_queue.h ..\rx_event.h ..\rx.h
 
 mkdir:
 	
+install: tests
+
+install9x: tests
+
+clean::
+    $(DEL) $(TESTS)
diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 779059455..0d0a3f7be 100644
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -5,7 +5,7 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG
+AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG -DNOGDI -DWIN32_LEAN_AND_MEAN
 
 RELDIR=tbutc
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
-- 
2.39.5