Build system update

windows/NTMakefile.config

@@ -34,9 +34,12 @@ VER_PRERELEASE=1
 # For each feature enabled here, a corresponding line must exist in
 # the inline Perl script in include\NTMakefile.
 
-# Enable Kerberos 5 support in applications
+# Enable Kerberos v5 support in applications
 KRB5=1
 
+# Enable Kerberos v4
+# KRB4=1
+
 # Enable PKINIT
 PKINIT=1
 
@@ -88,4 +91,4 @@ ENABLE_PTHREAD_SUPPORT=1
 # Use the Kerberos Credentials Manager
 # HAVE_KCM=1
 
-DIR_hdbdir=$${COMMON_APPDATA}/heimdal/hdb
+DIR_hdbdir=%{COMMON_APPDATA}\heimdal\hdb

windows/NTMakefile.w32

@@ -1,3 +1,33 @@
+########################################################################
+#
+# Copyright (c) 2009, Secure Endpoints Inc.
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
 
 all::
 
@@ -32,12 +62,14 @@ SRC=$(MAKEDIR)\..\..
 #----------------------------------------------------------------
 # Directory macros
 
-DESTDIR=$(SRC)\windows\dest_$(OUTDIR)
-OBJDIR =$(SRC)\windows\obj_$(OUTDIR)
+DESTDIR=$(SRC)\out32\dest_$(OUTDIR)
+OBJDIR =$(SRC)\out32\obj_$(OUTDIR)
 
 INCDIR =$(DESTDIR)\inc
 LIBDIR =$(DESTDIR)\lib
 BINDIR =$(DESTDIR)\bin
+SBINDIR=$(BINDIR)
+LIBEXECDIR=$(BINDIR)
 
 !ifdef RELDIR
 SRCDIR =$(SRC)\$(RELDIR)
@@ -97,6 +129,14 @@ SED=sed.exe
 #----------------------------------------------------------------
 # External dependencies
 
+# For pthread support to be enabled, both PTHREAD_INC and PTHREAD_LIB
+# should be defined.  PTHREAD_INC should be the include directory
+# where pthread.h is to be found (i.e. $(PTHREAD_INC)\pthread.h should
+# exist), and PTHREAD_LIB is the full path to the pthread import
+# library.
+#
+# Note that both paths should not contain any whitespace.
+
 !ifdef PTHREAD_INC
 pthreadinc= -I$(PTHREAD_INC)
 !endif
@@ -145,6 +185,9 @@ DLLGUILINK = $(DLLGUILINK_C) -OUT:$@ $**
 LIBGUI = $(LIBGUI_C) /OUT:$@ $**
 LIBCON = $(LIBCON_C) /OUT:$@ $**
 
+# Preprocess files to stdout using config.h
+CPREPROCESSOUT = $(CC) /EP /FI$(INCDIR)\config.h /TC /DCPP_ONLY=1
+
 # Resources
 
 RC2RES_C = $(RC) $(cincdirs) $(AUXRCFLAGS)
@@ -231,6 +274,9 @@ prep:: show-cmds
 {$(OBJ)}.x{$(OBJ)}.c:
 	$(CP) $< $@
 
+{$(OBJ)}.hx{$(INCDIR)}.h:
+	$(CP) $< $@
+
 {}.rc{$(OBJ)}.res:
 	$(RC2RES)
 
@@ -314,7 +360,7 @@ clean::
 	-$(RM) $(OBJ)\*.*
 !endif
 
-.SUFFIXES: .c .cpp .hin .h .x
+.SUFFIXES: .c .cpp .hin .h .x .hx
 
 #----------------------------------------------------------------------
 # Manifest handling
@@ -373,3 +419,5 @@ LIBKRB5	    =$(LIBDIR)\libkrb5.lib
 LIBHEIMNTLM =$(LIBDIR)\libheimntlm.lib
 LIBGSSAPI   =$(LIBDIR)\libgssapi.lib
 LIBHDB	    =$(LIBDIR)\libhdb.lib
+LIBKADM5SRV =$(LIBDIR)\libkadm5srv.lib
+LIBKADM5CLNT=$(LIBDIR)\libkadm5clnt.lib