windows: rename WINDIR -> WIN_DIR to follow the same change in Tcl

2 files changed, 31 insertions, 31 deletions

diff --git a/win/makefile.bc b/win/makefile.bc
index 5a22c95..178fea0 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -231,14 +231,14 @@ TKOBJS = \
 # by exactly one ' ' (see below the rule for making TKSTUBLIB)

 TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj

 

-WINDIR      = $(ROOT)\win

+WIN_DIR      = $(ROOT)\win

 GENERICDIR  = $(ROOT)\generic

 XLIBDIR     = $(ROOT)\xlib

 BITMAPDIR   = $(ROOT)\bitmaps

 TCLLIBDIR   = $(TCLDIR)\win\$(OUTDIRNAME)

-RCDIR       = $(WINDIR)\rc

+RCDIR       = $(WIN_DIR)\rc

 

-TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \

+TK_INCLUDES = -I$(WIN_DIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \

       -I$(TCLDIR)\generic -I$(TCLDIR)\win

 

 TK_DEFINES  = -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES) SUPPORT_CONFIG_EMBEDDED

@@ -441,7 +441,7 @@ genstubs:
 # Special case object file targets

 #

 

-$(TMPDIR)\testMain.obj: $(WINDIR)\winMain.c

+$(TMPDIR)\testMain.obj: $(WIN_DIR)\winMain.c

   $(cc32) $(WISH_CFLAGS) -DTK_TEST -o$@ $?

 

 $(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c

@@ -450,13 +450,13 @@ $(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
 $(TMPDIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c

   $(cc32) $(WISH_CFLAGS) -o$@ $?

 

-$(TMPDIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c

+$(TMPDIR)\tkWinTest.obj: $(WIN_DIR)\tkWinTest.c

   $(cc32) $(WISH_CFLAGS) -o$@ $?

 

 $(TMPDIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c

   $(cc32) $(WISH_CFLAGS) -o$@ $?

 

-$(TMPDIR)\winMain.obj: $(WINDIR)\winMain.c

+$(TMPDIR)\winMain.obj: $(WIN_DIR)\winMain.c

   $(cc32) $(WISH_CFLAGS) -o$@ $?

 

 $(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c

@@ -472,7 +472,7 @@ $(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
 {$(GENERICDIR)}.c{$(TMPDIR)}.obj:

   $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<

 

-{$(WINDIR)}.c{$(TMPDIR)}.obj:

+{$(WIN_DIR)}.c{$(TMPDIR)}.obj:

   $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<

 

 {$(ROOT)\unix}.c{$(TMPDIR)}.obj:

@@ -502,7 +502,7 @@ $(TMPDIR)\tk.res: \
     $(RCDIR)\cursor*.cur \

     $(RCDIR)\tk.ico

 

-$(GENERICDIR)/default.h: $(WINDIR)/tkWinDefault.h

+$(GENERICDIR)/default.h: $(WIN_DIR)/tkWinDefault.h

 $(GENERICDIR)/tkButton.c: $(GENERICDIR)/default.h

 $(GENERICDIR)/tkCanvas.c: $(GENERICDIR)/default.h

 $(GENERICDIR)/tkEntry.c: $(GENERICDIR)/default.h

@@ -530,6 +530,6 @@ $(GENERICDIR)/tkTextWind.c: $(GENERICDIR)/tkText.h
 $(GENERICDIR)/tkMacWinMenu.c: $(GENERICDIR)/tkMenu.h

 $(GENERICDIR)/tkMenu.c: $(GENERICDIR)/tkMenu.h

 $(GENERICDIR)/tkMenuDraw.c: $(GENERICDIR)/tkMenu.h

-$(WINDIR)/tkWinMenu.c: $(GENERICDIR)/tkMenu.h

+$(WIN_DIR)/tkWinMenu.c: $(GENERICDIR)/tkMenu.h

 

 

diff --git a/win/makefile.vc b/win/makefile.vc
index d2795c9..bec8607 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -406,15 +406,15 @@ TKSTUBOBJS = \
 	$(TMP_DIR)\ttkStubLib.obj

 

 

-WINDIR          = $(ROOT)\win

+WIN_DIR          = $(ROOT)\win

 GENERICDIR	= $(ROOT)\generic

 XLIBDIR		= $(ROOT)\xlib

 TTKDIR		= $(ROOT)\generic\ttk

 BITMAPDIR	= $(ROOT)\bitmaps

 DOCDIR		= $(ROOT)\doc

-RCDIR		= $(WINDIR)\rc

+RCDIR		= $(WIN_DIR)\rc

 

-TK_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \

+TK_INCLUDES	= -I"$(WIN_DIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \

 			$(TCL_INCLUDES)

 

 CONFIG_DEFS     =-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \

@@ -759,7 +759,7 @@ $(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TCLTOOLSDIR)\$$(@F)
 	$(CPY) $(TCLTOOLSDIR)\$(@F) $(@D)

 

 $(BMP):

-	$(CPY) $(WINDIR)\rc\$(@F) $(@D)

+	$(CPY) $(WIN_DIR)\rc\$(@F) $(@D)

 

 $(HELPFILE): $(HELPRTF) $(BMP)

 	cd $(DOCTMP_DIR)

@@ -828,7 +828,7 @@ close $$f
 # Special case object file targets

 #---------------------------------------------------------------------

 

-$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c

+$(TMP_DIR)\testMain.obj: $(WIN_DIR)\winMain.c

 	$(cc32) $(WISH_CFLAGS) -DTK_TEST \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -839,13 +839,13 @@ $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
 $(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c

 	$(cc32) $(WISH_CFLAGS) -Fo$@ $?

 

-$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c

+$(TMP_DIR)\tkWinTest.obj: $(WIN_DIR)\tkWinTest.c

 	$(cc32) $(WISH_CFLAGS) -Fo$@ $?

 

 $(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c

 	$(cc32) $(WISH_CFLAGS) -Fo$@ $?

 

-$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c

+$(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c

 	$(cc32) $(WISH_CFLAGS) \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -858,7 +858,7 @@ $(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
 	$(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $?

 

 

-$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in

+$(TMP_DIR)\wish.exe.manifest: $(WIN_DIR)\wish.exe.manifest.in

 	@nmakehlp -s << $** >$@

 @MACHINE@	  $(MACHINE:IX86=X86)

 @TK_WIN_VERSION@  $(TK_DOTVERSION).0.0

@@ -879,7 +879,7 @@ depend:
 	set TCL_LIBRARY=$(TCL_LIBRARY)

 	$(TCLSH) $(TCLTOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

 		-passthru:"-DBUILD_tk $(TK_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

-		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \

+		$(WIN_DIR),$$(WIN_DIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \

 		$(BITMAPDIR),$$(BITMAPDIR) @<<

 $(TKOBJS)

 <<

@@ -923,7 +923,7 @@ $<
 $<

 <<

 

-{$(WINDIR)}.c{$(TMP_DIR)}.obj::

+{$(WIN_DIR)}.c{$(TMP_DIR)}.obj::

 	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<

 $<

 <<

@@ -1017,18 +1017,18 @@ tidy:
 clean:

 	@echo Cleaning $(TMP_DIR)\* ...

 	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

-	@echo Cleaning $(WINDIR)\nmakehlp.obj ...

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

-	@echo Cleaning $(WINDIR)\nmakehlp.exe ...

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@echo Cleaning $(WINDIR)\_junk.pch ...

-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

-	@echo Cleaning $(WINDIR)\vercl.x ...

-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

-	@echo Cleaning $(WINDIR)\vercl.i ...

-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

-	@echo Cleaning $(WINDIR)\versions.vc ...

-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

+	@echo Cleaning $(WIN_DIR)\nmakehlp.obj ...

+	@if exist $(WIN_DIR)\nmakehlp.obj del $(WIN_DIR)\nmakehlp.obj

+	@echo Cleaning $(WIN_DIR)\nmakehlp.exe ...

+	@if exist $(WIN_DIR)\nmakehlp.exe del $(WIN_DIR)\nmakehlp.exe

+	@echo Cleaning $(WIN_DIR)\_junk.pch ...

+	@if exist $(WIN_DIR)\_junk.pch del $(WIN_DIR)\_junk.pch

+	@echo Cleaning $(WIN_DIR)\vercl.x ...

+	@if exist $(WIN_DIR)\vercl.x del $(WIN_DIR)\vercl.x

+	@echo Cleaning $(WIN_DIR)\vercl.i ...

+	@if exist $(WIN_DIR)\vercl.i del $(WIN_DIR)\vercl.i

+	@echo Cleaning $(WIN_DIR)\versions.vc ...

+	@if exist $(WIN_DIR)\versions.vc del $(WIN_DIR)\versions.vc

 

 realclean: hose