windows-pt_util-20090527

[openafs.git] / src / ptserver / NTMakefile

diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile
index 4d87ca6..5592050 100644 (file)
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -10,6 +10,7 @@
 RELDIR=ptserver
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !include ..\config\NTMakefile.version
+AFSDEV_AUXCDEFINES = -DAFS_USE_GETTIMEOFDAY -DSUPERGROUPS
 
 ############################################################################
 # Definitions for installing header files
@@ -51,6 +52,7 @@ PTSERVER_EXEOBJS =\
        $(OUT)\ptutils.obj \
        $(OUT)\ptprocs.obj \
        $(OUT)\utils.obj \
+        $(OUT)\map.obj \
        $(OUT)\ptserver.res
 
 
@@ -67,24 +69,24 @@ PTSERVER_EXELIBS =\
        $(DESTDIR)\lib\afs\afsaudit.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
-       $(DESTDIR)\lib\cm_dns.obj
+       $(DESTDIR)\lib\libafsconf.lib
 
 !IF (("$(SYS_NAME)"!="i386_win95" ) && ("$(SYS_NAME)"!="I386_WIN95" ))
 PTSERVER_EXELIBS =$(PTSERVER_EXELIBS) $(DESTDIR)\lib\afs\afsprocmgmt.lib
 !ENDIF
 
 $(PTSERVER): $(PTSERVER_EXEOBJS) $(RXKADOBJS) $(PTSERVER_EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
-
-
+        $(CODESIGN_USERLAND)
 
 ############################################################################
 # build pts.exe
 
 PTS = $(DESTDIR)\bin\pts.exe
 PTCLIENT = $(DESTDIR)\bin\ptclient.exe
+PT_UTIL  = $(DESTDIR)\bin\pt_util.exe
 
 PTS_EXEOBJS =\
        $(OUT)\pts.obj \
@@ -95,6 +97,14 @@ PTCLIENT_EXEOBJS =\
         $(OUT)\display.obj \
        $(OUT)\ptclient.res
 
+PT_UTIL_EXEOBJS = \
+        $(OUT)\pt_util.obj \
+        $(OUT)\ptutils.obj \
+        $(OUT)\ubik.obj \
+        $(OUT)\utils.obj \
+        $(OUT)\map.obj \
+        $(OUT)\pt_util.res
+
 PTS_EXELIBS =\
        $(DESTDIR)\lib\afsubik.lib \
        $(DESTDIR)\lib\afs\afsauth.lib \
@@ -109,18 +119,25 @@ PTS_EXELIBS =\
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
        $(DESTDIR)\lib\afs\afspioctl.lib \
-       $(DESTDIR)\lib\cm_dns.obj
+       $(DESTDIR)\lib\libafsconf.lib
 
 $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS) 
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 $(PTCLIENT): $(PTCLIENT_EXEOBJS) $(PTS_EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
+$(PT_UTIL): $(PT_UTIL_EXEOBJS) $(PTS_EXELIBS)
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
+        $(_VC_MANIFEST_EMBED_EXE)
+       $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 
 ############################################################################
@@ -132,13 +149,24 @@ $(OUT)\pts.res: AFS_component_version_number.h
 
 $(OUT)\ptclient.res: AFS_component_version_number.h
 
+$(OUT)\pt_util.res: AFS_component_version_number.h
+
 ############################################################################
 # rxgen on pting.xg
 
 $(INCFILEDIR)\afs\ptint.h : ptint.h
 
-ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg
-       $(RXGEN) -x $**
+ptint.cs.c: ptint.xg ptint.h
+       $(RXGEN) -x -C -u -o $@ ptint.xg
+
+ptint.ss.c: ptint.xg ptint.h
+       $(RXGEN) -x -S -o $@ ptint.xg
+
+ptint.xdr.c: ptint.xg ptint.h
+       $(RXGEN) -x -c -o $@ ptint.xg
+
+ptint.h: ptint.xg
+       $(RXGEN) -x -h -u -o $@ ptint.xg
 
 ############################################################################
 # Definitions for generating files via COMPILE_ET
@@ -152,10 +180,11 @@ pterror.h pterror.c: pterror.et
 ############################################################################
 # install pts, ptserver and afsprot.lib
 
-install: $(INCFILES) ptint.ss.c ptint.cs.c ptint.xdr.c $(LIBFILE) $(PTSERVER) $(PTS) $(PTCLIENT) $(OUT)\readgroup.exe \
+install: $(INCFILES) ptint.ss.c ptint.cs.c ptint.xdr.c $(LIBFILE) $(PTSERVER) $(PTS) $(PTCLIENT) $(PT_UTIL) $(OUT)\readgroup.exe \
        $(OUT)\readpwd.exe  $(OUT)\testpt.exe $(OUT)\db_verify.exe  \
        $(DESTDIR)\root.server\usr\afs\bin\pts.exe \
        $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe \
+       $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe \
        $(INCFILEDIR)\afs\prserver.h $(INCFILEDIR)\afs\print.h \
        $(INCFILEDIR)\afs\prerror.h $(INCFILEDIR)\afs\prclient.h
 
@@ -173,6 +202,9 @@ $(DESTDIR)\root.server\usr\afs\bin\pts.exe: $(PTS)
 $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe: $(PTCLIENT)
        $(COPY) $(PTCLIENT) $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe
 
+$(DESTDIR)\root.server\usr\afs\bin\pt_util.exe: $(PT_UTIL)
+       $(COPY) $(PT_UTIL) $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe
+
 $(INCFILEDIR)\afs\prserver.h: $(INCFILEDIR)\afs\ptserver.h
        $(COPY) $(INCFILEDIR)\afs\ptserver.h $(INCFILEDIR)\afs\prserver.h
 
@@ -193,27 +225,31 @@ clean::
        $(DEL) ptint.cs.c ptint.ss.c ptint.xdr.c ptint.h
        $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe 
        $(DEL) pterror.h pterror.c
-       $(DEL) $(PTS) $(PTCLIENT)
+       $(DEL) $(PTS) $(PTCLIENT) $(PT_UTIL)
 
 ############################################################################
 # tests?
 TEST_LIBS = $(PTS_EXELIBS)
 
 $(OUT)\readgroup.exe: $(OUT)\readgroup.obj $(LIBFILE) $(TEST_LIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\readpwd.exe: $(OUT)\readpwd.obj $(LIBFILE) $(TEST_LIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib 
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 mkdir: