From 6b6c052bcdaa702e26b3a4560cf6f4c53a0621ec Mon Sep 17 00:00:00 2001 From: Danilo Almeida Date: Tue, 18 May 1999 00:51:25 +0000 Subject: Rename windows.in to win-pre.in git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11463 dc483132-0cff-0310-8789-dd5450dbe970 --- src/config/ChangeLog | 5 ++ src/config/win-post.in | 2 +- src/config/win-pre.in | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ src/config/windows.in | 161 ------------------------------------------------- 4 files changed, 167 insertions(+), 162 deletions(-) create mode 100644 src/config/win-pre.in delete mode 100644 src/config/windows.in (limited to 'src') diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 4ff7ddc09..9df6575e4 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,8 @@ +Mon May 17 20:45:05 1999 Danilo Almeida + + * win-post.in, win-pre.in, windows.in: Rename windows.in to + win-pre.in. + Mon May 17 12:26:12 1999 Danilo Almeida * windows.in, win-post.in: Remove win16 stuff. Add diff --git a/src/config/win-post.in b/src/config/win-post.in index 5668331f8..71c1506e2 100644 --- a/src/config/win-post.in +++ b/src/config/win-post.in @@ -26,7 +26,7 @@ DLL_FILE_DEF=/DKRB5_DLL_FILE # Build the Makefile unless we are in the top-level #(where there is already an explicit rule). !if !defined(ZIP) && !defined(WINFILES) -Makefile: Makefile.in $(BUILDTOP)\config\windows.in $(BUILDTOP)\config\win-post.in +Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post.in $(BUILDTOP)\$(OUTPRE)wconfig $(BUILDTOP)\config < Makefile.in > Makefile !endif diff --git a/src/config/win-pre.in b/src/config/win-pre.in new file mode 100644 index 000000000..25ecb8fc3 --- /dev/null +++ b/src/config/win-pre.in @@ -0,0 +1,161 @@ +WHAT=windows + +all:: outpre-dir + +all:: all-$(WHAT) +clean:: clean-$(WHAT) +install:: install-$(WHAT) +check:: check-$(WHAT) + +all-windows:: +clean-windows:: +install-windows:: +check-windows:: + +all-windows:: Makefile +clean-windows:: Makefile + +# +# Figure out the CPU +# +!if !defined(CPU) || "$(CPU)" == "" +CPU=$(PROCESSOR_ARCHITECTURE) +!endif # CPU + +!if "$(CPU)" == "" +CPU=i386 +!endif + +# Change x86 or X86 to i386 +!if ( "$(CPU)" == "X86" ) || ( "$(CPU)" == "x86" ) +CPU=i386 +!endif # CPU == X86 + +!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) +!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA) +!endif +# +# End of figuring out CPU +# + + +# NOTE: ^ is an escape char for NMAKE. +!ifdef NODEBUG +OUTPRE_DBG=rel +!else +OUTPRE_DBG=dbg +!endif +OUTPRE1=obj +OUTPRE2=$(OUTPRE1)\$(CPU) +OUTPRE3=$(OUTPRE2)\$(OUTPRE_DBG) +OUTPRE=$(OUTPRE3)^\ + +$(OUTPRE): + -@if not exist $(OUTPRE1)\nul mkdir $(OUTPRE1) + -@if not exist $(OUTPRE2)\nul mkdir $(OUTPRE2) + -@if not exist $(OUTPRE3)\nul mkdir $(OUTPRE3) + -@if exist $(OUTPRE3)\nul echo Output will go to $(OUTPRE3). + -@if not exist $(OUTPRE3)\nul echo Could not create $(OUTPRE3). + +clean-windows-dir:: + -@if exist $(OUTPRE3)\nul rmdir $(OUTPRE3) + -@if exist $(OUTPRE2)\nul rmdir $(OUTPRE2) + -@if exist $(OUTPRE1)\nul rmdir $(OUTPRE1) + +# Directory syntax: +# +# begin absolute path +ABS=^\ +# begin relative path +REL= +# up-directory +U=.. +# path separator +S=^\ +# this is magic... should only be used for preceding a program invocation +C=.^\ + +srcdir = . +SRCTOP = $(srcdir)\$(BUILDTOP) + +# +# The name of the C compiler for the target +# +CC=cl /nologo +CL= + +PDB_OPTS=-Fd$(OUTPRE)\ -FD + +# /ZI gives better debug info in each object file (MSVC 6.0 or higher). +# /Zi gives debug info in each object file. +# /Gs Avoid stack probes (they don't seem to work anyway) +# /Os optimize for space. FIXME: Do not use /Ox; it miscompiles the DES lib! +# /Od disable optimization (for debugging) +# /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) +# +!ifdef NODEBUG +CCOPTS =/Os /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) +CCOPTS2=/Os /W3 $(PDB_OPTS) $(XTRA) +LOPTS= +!else +CCOPTS =/Od /ZI /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) +CCOPTS2=/Od /ZI /W3 $(PDB_OPTS) $(XTRA) +LOPTS=-debug +!endif + +# XXX - NOTE: We should probably use DllMainCRTStartup +LINKOPTS=-incremental:no $(LOPTS) -nologo -dll -entry:DllMain +LINKOPTS2=-incremental:no $(LOPTS) -nologo + +CPPFLAGS = -I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 +DEFS = $(CPPFLAGS) +CFLAGS2 = $(CCOPTS2) $(DEFS) + +RM=$(BUILDTOP)\config\rm.bat +LIBECHO=$(BUILDTOP)\util\windows\$(OUTPRE)libecho +CP=copy +MV=ren +LN=copy +LIBCMD=lib +AWK=rem +RC = rc +CVTRES = cvtres + +CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr32.lib +PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof32.lib +KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib +K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib + +GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib +WLIB= + +ARADD=rem +RANLIB=rem +ARCHIVE=rem + +LIBEXT=lib +OBJEXT=obj +EXEEXT=.exe + +MFLAGS=$(MAKEFLAGS) + +{}.rc{$(OUTPRE)}.res: + $(RC) $(RCFLAGS) -fo $@ -r $< + +{}.c{$(OUTPRE)}.obj: + $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + +{}.cxx{$(OUTPRE)}.obj: + $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + +{}.cpp{$(OUTPRE)}.obj: + $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< + +# +# End of Win32 pre-config lines (config/win-pre.in) +# + diff --git a/src/config/windows.in b/src/config/windows.in deleted file mode 100644 index 646d3d9c8..000000000 --- a/src/config/windows.in +++ /dev/null @@ -1,161 +0,0 @@ -WHAT=windows - -all:: outpre-dir - -all:: all-$(WHAT) -clean:: clean-$(WHAT) -install:: install-$(WHAT) -check:: check-$(WHAT) - -all-windows:: -clean-windows:: -install-windows:: -check-windows:: - -all-windows:: Makefile -clean-windows:: Makefile - -# -# Figure out the CPU -# -!if !defined(CPU) || "$(CPU)" == "" -CPU=$(PROCESSOR_ARCHITECTURE) -!endif # CPU - -!if "$(CPU)" == "" -CPU=i386 -!endif - -# Change x86 or X86 to i386 -!if ( "$(CPU)" == "X86" ) || ( "$(CPU)" == "x86" ) -CPU=i386 -!endif # CPU == X86 - -!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) -!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA) -!endif -# -# End of figuring out CPU -# - - -# NOTE: ^ is an escape char for NMAKE. -!ifdef NODEBUG -OUTPRE_DBG=rel -!else -OUTPRE_DBG=dbg -!endif -OUTPRE1=obj -OUTPRE2=$(OUTPRE1)\$(CPU) -OUTPRE3=$(OUTPRE2)\$(OUTPRE_DBG) -OUTPRE=$(OUTPRE3)^\ - -$(OUTPRE): - -@if not exist $(OUTPRE1)\nul mkdir $(OUTPRE1) - -@if not exist $(OUTPRE2)\nul mkdir $(OUTPRE2) - -@if not exist $(OUTPRE3)\nul mkdir $(OUTPRE3) - -@if exist $(OUTPRE3)\nul echo Output will go to $(OUTPRE3). - -@if not exist $(OUTPRE3)\nul echo Could not create $(OUTPRE3). - -clean-windows-dir:: - -@if exist $(OUTPRE3)\nul rmdir $(OUTPRE3) - -@if exist $(OUTPRE2)\nul rmdir $(OUTPRE2) - -@if exist $(OUTPRE1)\nul rmdir $(OUTPRE1) - -# Directory syntax: -# -# begin absolute path -ABS=^\ -# begin relative path -REL= -# up-directory -U=.. -# path separator -S=^\ -# this is magic... should only be used for preceding a program invocation -C=.^\ - -srcdir = . -SRCTOP = $(srcdir)\$(BUILDTOP) - -# -# The name of the C compiler for the target -# -CC=cl /nologo -CL= - -PDB_OPTS=-Fd$(OUTPRE)\ -FD - -# /ZI gives better debug info in each object file (MSVC 6.0 or higher). -# /Zi gives debug info in each object file. -# /Gs Avoid stack probes (they don't seem to work anyway) -# /Os optimize for space. FIXME: Do not use /Ox; it miscompiles the DES lib! -# /Od disable optimization (for debugging) -# /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) -# -!ifdef NODEBUG -CCOPTS =/Os /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) -CCOPTS2=/Os /W3 $(PDB_OPTS) $(XTRA) -LOPTS= -!else -CCOPTS =/Od /ZI /W3 /MD $(PDB_OPTS) $(XTRA) $(DLL_FILE_DEF) -CCOPTS2=/Od /ZI /W3 $(PDB_OPTS) $(XTRA) -LOPTS=-debug -!endif - -# XXX - NOTE: We should probably use DllMainCRTStartup -LINKOPTS=-incremental:no $(LOPTS) -nologo -dll -entry:DllMain -LINKOPTS2=-incremental:no $(LOPTS) -nologo - -CPPFLAGS = -I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 -DEFS = $(CPPFLAGS) -CFLAGS2 = $(CCOPTS2) $(DEFS) - -RM=$(BUILDTOP)\config\rm.bat -LIBECHO=$(BUILDTOP)\util\windows\$(OUTPRE)libecho -CP=copy -MV=ren -LN=copy -LIBCMD=lib -AWK=rem -RC = rc -CVTRES = cvtres - -CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr32.lib -PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof32.lib -KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib -K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib - -GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib -WLIB= - -ARADD=rem -RANLIB=rem -ARCHIVE=rem - -LIBEXT=lib -OBJEXT=obj -EXEEXT=.exe - -MFLAGS=$(MAKEFLAGS) - -{}.rc{$(OUTPRE)}.res: - $(RC) $(RCFLAGS) -fo $@ -r $< - -{}.c{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< - -{}.cxx{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< - -{}.cpp{$(OUTPRE)}.obj: - $(CC) $(CFLAGS) -Fo$(OUTPRE)\ -c $< - -# -# End of Win32 pre-config lines (config/windows.in) -# - -- cgit