windows-build-do-not-mix-pthread-and-lwp-20081008

[openafs.git] / src / tbutc / NTMakefile

diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 41c1388..815530a 100644 (file)
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -66,6 +66,9 @@ BUTCOBJS   = $(OUT)\dbentries.obj \
          $(OUT)\butc_xbsa.obj \
          $(LWPOBJS) \
          $(BUCOORDOBJS)
+
+BUTCRES = $(OUT)\butc.res
+
 BUTCINCLUDE= -I. -I$(DESTDIR)\include -I$(XBSADIR)
 BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
             $(DESTDIR)\lib\afs\afsbubasics.lib \
@@ -73,12 +76,10 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
              $(BUTMLIBS) \
             $(DESTDIR)\lib\afs\afsvldb.lib \
             $(DESTDIR)\lib\afs\afskauth.lib \
-            $(DESTDIR)\lib\afsubik.lib \
             $(DESTDIR)\lib\afs\afsauth.lib \
             $(DESTDIR)\lib\afsrpc.lib \
              $(DESTDIR)\lib\afsrxkad.lib \
-            $(DESTDIR)\lib\afsrx.lib \
-             $(DESTDIR)\lib\afslwp.lib \
+            $(DESTDIR)\lib\afsubik.lib \
              $(DESTDIR)\lib\afs\afsutil.lib \
              $(DESTDIR)\lib\afs\afsusd.lib \
             $(DESTDIR)\lib\afs\afspioctl.lib \
@@ -93,7 +94,8 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
        $(DESTDIR)\lib\afspthread.lib \
 !ENDIF
             $(DESTDIR)\lib\afsdes.lib \
-            $(DESTDIR)\lib\cm_dns.obj
+            $(DESTDIR)\lib\cm_dns.obj \
+             $(DESTDIR)\lib\cm_nls.obj
 
 
 #      $(DESTDIR)\lib\afsauthent.lib \
@@ -110,10 +112,13 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
 # nmake /nologo /f ntmakefile install
 #----------------------------------------------- BUTC
 
-$(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+$(BUTCRES): butc.rc AFS_component_version_number.h
+
+$(BUTCEXE): $(BUTCOBJS) $(BUTCRES) $(BUTCLIBS)
+       $(EXECONLINK) dnsapi.lib mpr.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
+        $(CODESIGN_USERLAND)
 
 .c.$(OUT)\obj:
        $(C2OBJ) -I$(BUCOORD) $<
@@ -186,3 +191,5 @@ noversion: install
 
 mkdir:
        
+clean::
+       $(DEL) $(BUTCRES)