diff options
author | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 02:02:15 +0000 |
---|---|---|
committer | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 02:02:15 +0000 |
commit | 9e5aeeb6c3f958479380d852f7b892f05bc55af1 (patch) | |
tree | 6717443b713ddbf2e570ee493a2fffe9d6cc38cc /src | |
parent | c08ab6eb5ddcdfa905a4cb7c1c6303e48ae058f7 (diff) | |
download | krb5-9e5aeeb6c3f958479380d852f7b892f05bc55af1.zip krb5-9e5aeeb6c3f958479380d852f7b892f05bc55af1.tar.gz krb5-9e5aeeb6c3f958479380d852f7b892f05bc55af1.tar.bz2 |
Pull changes from krb5-1-1 branch: a) Make is so
that all C flags are the same and so that the only difference
between EXE and DLL builds are the DLL_LINKOPTS and EXE_LINKOPTS
linker options. b) Fix DNS error messages to wshelper instead of
version server. c) Fix DNS flags it does not try to depend on mit
dir. Define NULL so we can do directory existence checks via the
shell under both NT and 9x.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11939 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/config/ChangeLog | 10 | ||||
-rw-r--r-- | src/config/win-pre.in | 64 |
2 files changed, 49 insertions, 25 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index a684b04..749ea2f 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,13 @@ +1999-12-03 Danilo Almeida <dalmeida@mit.edu> + + * win-pre.in: Pull changes from krb5-1-1 branch: a) Make is so + that all C flags are the same and so that the only difference + between EXE and DLL builds are the DLL_LINKOPTS and EXE_LINKOPTS + linker options. b) Fix DNS error messages to wshelper instead of + version server. c) Fix DNS flags it does not try to depend on mit + dir. Define NULL so we can do directory existence checks via the + shell under both NT and 9x. + 1999-10-26 Tom Yu <tlyu@mit.edu> * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 8ed8a51..73fdb2e 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -38,6 +38,11 @@ CPU=i386 # End of figuring out CPU # +!if "$(OS)" == "Windows_NT" +NULL= +!else +NULL=nul +!endif # NOTE: ^ is an escape char for NMAKE. !ifdef NODEBUG @@ -78,13 +83,31 @@ C=.^\ srcdir = . SRCTOP = $(srcdir)\$(BUILDTOP) +!if defined(KRB5_USE_DNS) +!if !defined(DNS_INC) +!message Must define DNS_INC to point to wshelper includes dir! +!error +!endif +!if !defined(DNS_LIB) +!message Must define DNS_LIB to point to wshelper library! +!error +!endif +DNSLIBS=$(DNS_LIB) +DNSFLAGS=-I$(DNS_INC) -DKRB5_DNS_LOOKUP -DWSHELPER +!else +DNSLIBS= +DNSFLAGS= +!endif + # # The name of the C compiler for the target # -CC=cl /nologo -CL= +CC=cl PDB_OPTS=-Fd$(OUTPRE)\ -FD +CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) +CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) +LOPTS=-nologo -incremental:no # /ZI gives better debug info in each object file (MSVC 6.0 or higher). # /Zi gives debug info in each object file. @@ -94,32 +117,20 @@ PDB_OPTS=-Fd$(OUTPRE)\ -FD # /MD (Win32) thread safe, ML would be single threaded, don't build with ML # -# CCOPTS is for DLL compiles -# CCOPTS2 is for non-DLL compiles (EXEs, for example) +# CCOPTS was for DLL compiles +# CCOPTS2 was for non-DLL compiles (EXEs, for example) # !ifdef NODEBUG -CCOPTS =/Os /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) -CCOPTS2=/Os /W3 $(PDB_OPTS) $(XTRA) -LOPTS= +CCOPTS=/Os /MD $(CCOPTS) +LOPTS=$(LOPTS) !else -CCOPTS =/Od /ZI /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) -CCOPTS2=/Od /ZI /W3 $(PDB_OPTS) $(XTRA) -LOPTS=-debug +CCOPTS=/Od /ZI /MDd $(CCOPTS) +LOPTS=$(LOPTS) -debug !endif # XXX - NOTE: We should probably use DllMainCRTStartup -LINKOPTS=-incremental:no $(LOPTS) -nologo -dll -entry:DllMain -LINKOPTS2=-incremental:no $(LOPTS) -nologo - -!if defined(KRB5_USE_DNS) -DNSFLAGS= -DKRB5_DNS_LOOKUP -DWSHELPER -!else -DNSFLAGS= -!endif - -CPPFLAGS = -I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 -I$(SRCTOP)\mit\windows\include $(DNSFLAGS) -DEFS = $(CPPFLAGS) -CFLAGS2 = $(CCOPTS2) $(DEFS) +DLL_LINKOPTS=$(LOPTS) -dll -entry:DllMain +EXE_LINKOPTS=$(LOPTS) RM=$(BUILDTOP)\config\rm.bat LIBECHO=$(BUILDTOP)\util\windows\$(OUTPRE)libecho @@ -155,17 +166,20 @@ MFLAGS=$(MAKEFLAGS) MAKE=-$(MAKE) !endif +CFLAGS = $(CCOPTS) +ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) + {}.rc{$(OUTPRE)}.res: $(RC) $(RCFLAGS) -fo $@ -r $< {}.c{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + $(CC) $(ALL_CFLAGS) -Fo$(OUTPRE)\ -c $< {}.cxx{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + $(CC) $(ALL_CFLAGS) -Fo$(OUTPRE)\ -c $< {}.cpp{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + $(CC) $(ALL_CFLAGS) -Fo$(OUTPRE)\ -c $< # # End of Win32 pre-config lines (config/win-pre.in) |