From: ibs <ibs@opencascade.com>
Date: Mon, 19 Nov 2012 11:46:10 +0000 (+0400)
Subject: 23505: The nmake support are not used about 5-6 years and the one requires to be... 
X-Git-Tag: V6_7_1~95
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=70e2bf7d4fde11b825b2cf2233144e36aaa6f3d2;p=occt-wok.git

23505: The nmake support are not used about 5-6 years and the one requires to be removed

OS:MKMAK, osutils:mkmak, osutils:mkmakx functions and template.mak, template.makx files have been removed
unused items have been removed from FILES files
---

diff --git a/src/WOKTclLib/FILES b/src/WOKTclLib/FILES
index 6b94868..48bc061 100755
--- a/src/WOKTclLib/FILES
+++ b/src/WOKTclLib/FILES
@@ -144,8 +144,6 @@ srcinc:::template.min
 srcinc:::template.minx
 srcinc:::template.mam
 srcinc:::template.mamx
-srcinc:::template.mak
-srcinc:::template.makx
 srcinc:::osutils.tcl
 srcinc:::config.h
 srcinc:::opencascade.gif
diff --git a/src/WOKTclLib/OS.tcl b/src/WOKTclLib/OS.tcl
index 662ef77..3e44cac 100644
--- a/src/WOKTclLib/OS.tcl
+++ b/src/WOKTclLib/OS.tcl
@@ -3299,107 +3299,6 @@ proc OS:MKPRC { {theOutDir {}} {theProjectType {}} {theIDE ""} } {
   close $anOutFile
 }
 
-# This function was created for *.mak files generation (compilation with nmake utilite of MS Visual Studio).
-# The function creates *.mak files for toolkits of all the modules of OCC with osutils:mkmak procedure,
-# for executables of all the modules of OCC with osutils:mkmakx procedure, then it generates All.mak files,
-# which will call compilation with generated *.mak files for toolkits and executables in appropriate order.
-proc OS:MKMAK { {plase {}} {ll {} } } {
-  if {$plase == ""} {
-    set BOX "[OS -box]/WindowsNT"
-  } else {
-    set BOX $plase
-  }
-
-  set lesmodules [OS -lm]
-  if { $ll != {} } {  set lesmodules $ll }
-
-  OS:mkdir $BOX
-
-  set unitlist ""
-  set filelist ""
-  foreach module $lesmodules {
-    append unitlist "[${module}:toolkits] "
-    append filelist "[${module}:toolkits] "
-    foreach execunit [OS:executable $module] {
-      append unitlist "$execunit "
-      foreach execfile [osutils:tk:files $execunit osutils:am:compilable 0] {
-        append filelist "[file rootname [file tail $execfile]] "
-      }
-    }
-  }
-  puts "unitlist is $unitlist"
-  foreach unit $unitlist {
-    if {[uinfo -t [woklocate -u $unit]] == "toolkit"} {
-      osutils:mkmak $BOX $unit
-    }
-    if {[uinfo -t [woklocate -u $unit]] == "executable"} {
-      osutils:mkmakx $BOX $unit
-    }
-  }
-
-  set fp [open [set fmak [file join $BOX All.mak]] w]
-  fconfigure $fp -translation crlf
-
-  set buffer ""
-  append buffer "\!IF \"\$(CFG)\" == \"\"\n"
-  append buffer "CFG=All - Win32 Debug\n"
-  append buffer "\!MESSAGE No configuration specified. Defaulting to All - Win32 Debug.\n"
-  append buffer "\!ENDIF \n"
-  append buffer "\!IF \"\$(OS)\" == \"Windows_NT\"\n"
-  append buffer "NULL=\n"
-  append buffer "\!ELSE \n"
-  append buffer "NULL=nul\n"
-  append buffer "\!ENDIF \n"
-  append buffer "\n"
-  append buffer "\!IF  \"\$(CFG)\" == \"All - Win32 Release\"\n"
-  append buffer "ALL : "
-  foreach unit $filelist {
-    append buffer "\"$unit - Win32 Release\" "
-  }
-  append buffer "\n"
-  append buffer "\n"
-  append buffer "CLEAN : "
-  foreach unit $filelist {
-    append buffer "\"$unit - Win32 ReleaseCLEAN\" "
-  }
-  append buffer "\n"
-  append buffer "\n"
-  append buffer "\!ELSEIF  \"\$(CFG)\" == \"All - Win32 Debug\"\n"
-  append buffer "ALL : "
-  foreach unit $filelist {
-    append buffer "\"$unit - Win32 Debug\" "
-  }
-  append buffer "\n"
-  append buffer "\n"
-  append buffer "CLEAN : "
-  foreach unit $filelist {
-    append buffer "\"$unit - Win32 DebugCLEAN\" "
-  }
-  append buffer "\n"
-  append buffer "\n"
-  append buffer "\!ENDIF \n"
-  append buffer "\n"
-  append buffer "\!IF \"\$(CFG)\" == \"All - Win32 Release\" \|\| \"\$(CFG)\" == \"All - Win32 Debug\"\n"
-  append buffer "\n"
-  append buffer "\n"
-
-  foreach unit $filelist {
-    append buffer "\!IF  \"\$(CFG)\" == \"All - Win32 Release\"\n"
-    append buffer "\"$unit - Win32 Release\" : \n"
-    append buffer "\t\$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\${unit}.mak CFG=\"${unit} - Win32 Release\" RECURSE=0 \n"
-    append buffer "\"$unit - Win32 ReleaseCLEAN\" : \n"
-    append buffer "\t\$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\${unit}.mak CFG=\"${unit} - Win32 Release\" CLEAN \n"
-    append buffer "\!ELSEIF  \"\$(CFG)\" == \"All - Win32 Debug\"\n"
-    append buffer "\"$unit - Win32 Debug\" : \n"
-    append buffer "\t\$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\${unit}.mak CFG=\"${unit} - Win32 Debug\" RECURSE=0 \n"
-    append buffer "\"$unit - Win32 DebugCLEAN\" : \n"
-    append buffer "\t\$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\${unit}.mak CFG=\"${unit} - Win32 Debug\" CLEAN \n"
-    append buffer "\!ENDIF \n"
-  }
-  append buffer "\!ENDIF \n"
-  puts $fp $buffer
-  close $fp
-}
 ;#
 ;# Fabrication des archives "source" :
 ;# Pas de plateforme a specifier.
diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 10bf98c..2d3177e 100755
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -1054,348 +1054,6 @@ proc osutils:vcprojx { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {}
   return $aVcFiles
 }
 
-;#
-;# Create file tkloc.mak for a shareable library (dll).
-;# in dir return the full path of the created file
-;#
-proc osutils:mkmak { dir tkloc {tmplat {} } {fmtcpp {} } } {
-  puts $tkloc
-  if { $tmplat == {} } {set tmplat [osutils:readtemplate mak "MS VC++ makefile"]}
-  if { $fmtcpp == {} } {set fmtcpp [osutils:mak:fmtcpp]}
-  set fp [open [set fdsp [file join $dir ${tkloc}.mak]] w]
-  fconfigure $fp -translation crlf
-  set l_compilable [osutils:compilable]
-  set tkused [wokUtils:LIST:Purge [osutils:tk:close [woklocate -u $tkloc]]]
-  set listloc [osutils:tk:units [woklocate -u $tkloc]]
-  set resultloc [osutils:justwnt $listloc]
-  regsub -all -- {__TKNAM__} $tmplat $tkloc tmplat
-  set area1 ""
-  append area1 "\!IF \"\$(RECURSE)\" == \"0\" \n"
-  append area1 "ALL : \"\$(OUTDIR)\\${tkloc}.dll\"\n"
-  append area1 "\!ELSE\n"
-  append area1 "ALL : "
-  if {$tkused != ""} {
-    foreach tkproj $tkused {
-      append area1 "\"$tkproj - Win32 Release\" "
-    }
-  }
-  append area1 " \"\$(OUTDIR)\\$tkloc.dll\"\n"
-  append area1 "\!ENDIF \n"
-  append area1 "\!IF \"\$(RECURSE)\" == \"1\"\n"
-  append area1 "CLEAN :"
-  if {$tkused != ""} {
-    foreach tkproj $tkused {
-      append area1 "\"$tkproj - Win32 ReleaseCLEAN\" "
-    }
-  }
-  append area1 "\n"
-  append area1 "\!ELSE\n"
-  append area1 "CLEAN :\n"
-  append area1 "\!ENDIF\n"
-  set tclused 0
-  set javaused 0
-  if [array exists written] { unset written }
-  foreach fxlo $resultloc {
-    set xlo [wokinfo -n $fxlo]
-    set lsrc   [osutils:tk:files $xlo osutils:compilable 0]
-    set fxlocxxparam [lindex [osutils:intersect3 [split [lindex [wokparam -v %CMPLRS_CXX_Options] 0]] [split [lindex [wokparam -v %CMPLRS_CXX_Options $fxlo] 0]] ] 2]
-    set fxlocparam [lindex [osutils:intersect3 [split [lindex [wokparam -v %CMPLRS_C_Options] 0]] [split [lindex [wokparam -v %CMPLRS_C_Options $fxlo] 0]] ] 2]
-    if {[lsearch [lindex [wokparam -v %CMPLRS_CXX_Options $fxlo] 0] "-I[lrange [lindex [wokparam -v %CSF_TCL_INCLUDE] 0] 0 end]"] != -1} {
-      set tclused 1
-    }
-    if {[lsearch [lindex [wokparam -v %CMPLRS_CXX_Options $fxlo] 0] "-I[lrange [lindex [wokparam -v %CSF_JavaHome]/include 0] 0 end]"] != -1} {
-      set javaused 1
-    }
-    if {[lsearch [lindex [wokparam -v %CMPLRS_C_Options $fxlo] 0] "-I[lrange [lindex [wokparam -v %CSF_TCL_INCLUDE] 0] 0 end]"] != -1} {
-      set tclused 1
-    }
-    if {[lsearch [lindex [wokparam -v %CMPLRS_C_Options $fxlo] 0] "-I[lrange [lindex [wokparam -v %CSF_JavaHome]/include 0] 0 end]"] != -1} {
-      set javaused 1
-    }
-
-    foreach srcfile $lsrc {
-      if { ![info exists written([file tail $srcfile])] } {
-        set written([file tail $srcfile]) 1
-        append area1 "\t-@erase \"\$(INTDIR)\\[wokUtils:EASY:bs1 [file root [wokUtils:FILES:wtail $srcfile 1]]].obj\"\n"
-      }
-    }
-  }
-  regsub -all -- {__FIELD1__} $tmplat $area1 tmplat
-
-  set area2 "LINK32_FLAGS=-nologo -subsystem:windows -dll -incremental:no -machine:IX86 -libpath:\"\$(LIBDIR)\" -implib:\$(LIBDIR)\\$tkloc.lib -out:\$(OUTDIR)\\$tkloc.dll "
-  set libused ""
-  foreach tkx [wokUtils:LIST:Purge [osutils:tk:close [woklocate -u $tkloc]]] {
-    append libused "${tkx}.lib "
-  }
-  set ltk [wokUtils:LIST:Purge [osutils:tk:close [woklocate -u $tkloc]]]
-  set ltk [lappend ltk $tkloc]
-  foreach tk $ltk {
-    foreach element [osutils:tk:hascsf [woklocate -p $tk:source:EXTERNLIB [wokcd]]] {
-      if {[wokparam -t %$element] != 0} {
-        set felem [file tail [lindex [wokparam -v "%$element"] 0]]
-        if {[lsearch $libused $felem] == "-1"} {
-          if {$felem != "\{\}"} {
-            set libused [concat $libused $felem]
-          }
-        }
-      }
-    }
-  }
-  if {$tclused == 1} {
-    append area2 "-libpath:\"\$(TCLHOME)\\lib\" "
-  }
-
-  foreach tk $libused {
-    append area2 "$tk "
-  }
-  append area2 "\n"
-  append area2 "LINK32_OBJS= \\\n"
-  if [array exists written] { unset written }
-  foreach fxlo $resultloc {
-    set xlo  [wokinfo -n $fxlo]
-    set lsrc [osutils:tk:files $xlo osutils:compilable 0]
-    foreach srcfile $lsrc {
-      if { ![info exists written([file tail $srcfile])] } {
-        set written([file tail $srcfile]) 1
-        append area2 "\t\"\$(INTDIR)\\[wokUtils:EASY:bs1 [file root [wokUtils:FILES:wtail $srcfile 1]]].obj\" \\\n"
-      }
-    }
-  }
-
-  regsub -all -- {__FIELD2__} $tmplat $area2 tmplat
-
-  set area3 ""
-  append area3 "\!IF \"\$(RECURSE)\" == \"0\" \n"
-  append area3 "ALL : \"\$(OUTDIR)\\${tkloc}.dll\"\n"
-  append area3 "\!ELSE\n"
-  append area3 "ALL : "
-  if {$tkused != ""} {
-    foreach tkproj $tkused {
-      append area3 "\"$tkproj - Win32 Debug\" "
-    }
-  }
-  append area3 " \"\$(OUTDIR)\\$tkloc.dll\"\n"
-  append area3 "\!ENDIF \n"
-  append area3 "\!IF \"\$(RECURSE)\" == \"1\"\n"
-  append area3 "CLEAN :"
-  if {$tkused != ""} {
-    foreach tkproj $tkused {
-      append area3 "\"$tkproj - Win32 DebugCLEAN\""
-    }
-  }
-  append area3 "\n"
-  append area3 "\!ELSE\n"
-  append area3 "CLEAN :\n"
-  append area3 "\!ENDIF\n"
-  if [array exists written] { unset written }
-
-  foreach fxlo $resultloc {
-    set xlo [wokinfo -n $fxlo]
-    set lsrc   [osutils:tk:files $xlo osutils:compilable 0]
-
-    foreach srcfile $lsrc {
-      if { ![info exists written([file tail $srcfile])] } {
-        set written([file tail $srcfile]) 1
-        append area3 "\t-@erase \"\$(INTDIR)\\[wokUtils:EASY:bs1 [file root [wokUtils:FILES:wtail $srcfile 1]]].obj\"\n"
-      }
-    }
-  }
-  regsub -all -- {__FIELD3__} $tmplat $area3 tmplat
-
-  set area4 "LINK32_FLAGS=-nologo -subsystem:windows -dll -incremental:no -machine:IX86 -debug -libpath:\"\$(LIBDIR)\"  -implib:\$(LIBDIR)\\$tkloc.lib -out:\$(OUTDIR)\\$tkloc.dll -pdb:\$(OUTDIR)\\$tkloc.pdb "
-  foreach tk $libused {
-    append area4 "$tk "
-  }
-  if {$tclused == 1} {
-    append area4 "-libpath:\"\$(TCLHOME)\\lib\" "
-  }
-
-  append area4 "\n"
-  append area4 "LINK32_OBJS= \\\n"
-  if [array exists written] { unset written }
-  foreach fxlo $resultloc {
-    set xlo [wokinfo -n $fxlo]
-    set lsrc   [osutils:tk:files $xlo osutils:compilable 0]
-    foreach srcfile $lsrc {
-      if { ![info exists written([file tail $srcfile])] } {
-        set written([file tail $srcfile]) 1
-        append area4 "\t\"\$(INTDIR)\\[wokUtils:EASY:bs1 [file root [wokUtils:FILES:wtail $srcfile 1]]].obj\" \\\n"
-      }
-    }
-  }
-
-  regsub -all -- {__FIELD4__} $tmplat $area4 tmplat
-
-  set area5 ""
-  if [array exists written] { unset written }
-  foreach fxlo $resultloc {
-    set xlo [wokinfo -n $fxlo]
-    set lsrc   [osutils:tk:files $xlo osutils:compilable 0]
-    set fxlocxxparam [lindex [osutils:intersect3 [split [lindex [wokparam -v %CMPLRS_CXX_Options] 0]] [split [lindex [wokparam -v %CMPLRS_CXX_Options $fxlo] 0]] ] 2]
-    set fxlocparam [lindex [osutils:intersect3 [split [lindex [wokparam -v %CMPLRS_C_Options] 0]] [split [lindex [wokparam -v %CMPLRS_C_Options $fxlo] 0]] ] 2]
-    if {$tclused == 1} {
-      set fxlocxxparam "-I\$(TCLHOME)\\include"
-    }
-    if {$javaused == 1} {
-      set fxlocxxparam "-I\$(JAVAHOME)\\include -I\$(JAVAHOME)\\include\\win32"
-    }
-    set fxloparam "$fxlocparam $fxlocxxparam"
-    #puts $fxloparam
-    foreach srcfile $lsrc {
-      if { ![info exists written([file tail $srcfile])] } {
-        set written([file tail $srcfile]) 1
-        set pkname [wokUtils:EASY:bs1 [file root [wokUtils:FILES:wtail $srcfile 1]]]
-
-        append area5 "SOURCE=..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $srcfile 3]]\n"
-        append area5 "\!IF  \"\$(CFG)\" == \"$tkloc - Win32 Release\"\n"
-        append area5 "CPP_SWITCHES=\/nologo \/MD \/W3 \/GX \/O2 $fxloparam \/I \"..\\..\\..\\inc\" \/I \"..\\..\\..\\drv\\$xlo\" \/I \"..\\..\\..\\src\\$xlo\" \/D \"WIN32\" \/D \"NDEBUG\" \/D \"_WINDOWS\" \/D \"WNT\" \/D \"No_Exception\" \/D \"__${xlo}_DLL\" \/Fo\"\$(INTDIR)\\\\\\\" \/Fd\"\$(INTDIR)\\\\\\\" \/FD \/D \"CSFDB\" \/c\n"
-        append area5 "\"\$(INTDIR)\\$pkname.obj\" : \$(SOURCE) \"\$(INTDIR)\"\n"
-        append area5 "\t\t\$(CPP) \$(CPP_SWITCHES) \$(SOURCE)\n"
-        append area5 "\n"
-        append area5 "\!ELSEIF  \"\$(CFG)\" == \"$tkloc - Win32 Debug\"\n"
-        append area5 "CPP_SWITCHES=\/nologo \/MDd \/W3 \/GX \/Zi \/Od $fxloparam \/I \"..\\..\\..\\inc\" \/I \"..\\..\\..\\drv\\$xlo\" \/I \"..\\..\\..\\src\\$xlo\" \/D \"WIN32\" \/D \"DEB\" \/D \"_DEBUG\" \/D \"_WINDOWS\" \/D \"WNT\" \/D \"CSFDB\" \/D \"__${xlo}_DLL\" \/Fo\"\$(INTDIR)\\\\\\\" \/Fd\"\$(INTDIR)\\\\\\\" \/FD \/c \n"
-        append area5 "\"\$(INTDIR)\\$pkname.obj\" : \$(SOURCE) \"\$(INTDIR)\"\n"
-        append area5 "\t\t\$(CPP) \$(CPP_SWITCHES) \$(SOURCE)\n"
-        append area5 "\n"
-        append area5 "\!ENDIF \n"
-      }
-    }
-  }
-  regsub -all -- {__FIELD5__} $tmplat $area5 tmplat
-
-  set area6 ""
-  foreach tk $tkused {
-    append area6 "\!IF  \"\$(CFG)\" == \"$tkloc - Win32 Release\"\n"
-    append area6 "\"$tk - Win32 Release\" \: \n"
-    append area6 "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Release\" \n"
-    append area6 "\"$tk - Win32 ReleaseCLEAN\" \: \n"
-    append area6 "   \$(MAKE)\/NOLOGO  \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Release\" RECURSE=1 CLEAN\n"
-    append area6 "\!ELSEIF  \"\$(CFG)\" == \"$tkloc - Win32 Debug\"\n"
-    append area6 "\"$tk - Win32 Debug\" \: \n"
-    append area6 "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Debug\" \n"
-    append area6 "\"$tk - Win32 DebugCLEAN\" \: \n"
-    append area6 "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Debug\" RECURSE=1 CLEAN\n"
-    append area6 "\!ENDIF\n"
-  }
-  regsub -all -- {__FIELD6__} $tmplat $area6 tmplat
-
-  if {$tclused == 1} {
-    set tclwarning "\!IFNDEF TCLHOME \n\!MESSAGE Compilation of this toolkit requires tcl. Set TCLHOME environment variable for proper compilation\n\!ENDIF"
-  } else {
-    set tclwarning ""
-  }
-  regsub -all -- {__TCLUSED__} $tmplat $tclwarning tmplat
-
-  if {$javaused == 1} {
-    set javawarning "\!IFNDEF JAVAHOME \n\!MESSAGE Compilation of this toolkit requires java. Set JAVAHOME environment variable for proper compilation\n\!ENDIF"
-  } else {
-    set javawarning ""
-  }
-  regsub -all -- {__JAVAUSED__} $tmplat $javawarning tmplat
-  puts $fp $tmplat
-  close $fp
-  return $fdsp
-}
-
-proc osutils:mkmakx { dir tkloc {tmplat {} } {fmtcpp {} } } {
-  if { $tmplat == {} } {set tmplat [osutils:readtemplate makx "MS VC++ makefile (executable)"]}
-  if { $fmtcpp == {} } {set fmtcpp [osutils:mak:fmtcpp]}
-  foreach f [osutils:tk:files $tkloc osutils:compilable 0] {
-    set tf [file rootname [file tail $f]]
-    set fp [open [set fdsp [file join $dir ${tf}.mak]] w]
-    puts $fdsp
-    set tclused 0
-    fconfigure $fp -translation crlf
-    set l_compilable [osutils:compilable]
-    regsub -all -- {__XQTNAM__} $tmplat $tf tmplat
-    set tkused ""
-    puts [LibToLinkX [woklocate -u $tkloc] $tf]
-    foreach tkx [LibToLinkX [woklocate -u $tkloc] $tf] {
-      if {[uinfo -t [woklocate -u $tkx]] == "toolkit"} {
-        append tkused "${tkx}.lib "
-      }
-      if {[woklocate -u $tkx] == "" } {
-        append tkused "${tkx}.lib "
-      }
-    }
-    foreach tk [LibToLinkX [woklocate -u $tkloc] $tf] {
-      foreach element [osutils:tk:hascsf [woklocate -p ${tk}:source:EXTERNLIB [wokcd]]] {
-        if {[wokparam -t %$element] != 0} {
-          set elemlist [wokparam -v "%$element"]
-          set felem [file tail [lindex $elemlist 0]]
-          if {[lsearch $tkused $felem] == "-1"} {
-            if {$felem != "\{\}"} {
-              #puts "was found $element $felem"
-              if {$element == "CSF_TclLibs"} { set tclused 1}
-              set tkused [concat $tkused $felem]
-            }
-          }
-        }
-      }
-    }
-
-    set WOKSteps_exec_link [wokparam -v %WOKSteps_exec_link [woklocate -u $tkloc]]
-    if { [regexp {WOKStep_DLLink} $WOKSteps_exec_link] || [regexp {WOKStep_Libink} $WOKSteps_exec_link] } {
-      set tkused [concat $tkused "\/dll"]
-      if {$tclused != 1} {
-        regsub -all -- {__COMPOPT__} $tmplat "\/MD" tmplat
-        regsub -all -- {__COMPOPTD__} $tmplat "\/MDd" tmplat
-      } else {
-        regsub -all -- {__COMPOPT__} $tmplat "\/MD \/I \"\$(TCLHOME)\\include\"" tmplat
-        regsub -all -- {__COMPOPTD__} $tmplat "\/MDd \/I \"\$(TCLHOME)\\include\"" tmplat
-      }
-      regsub -all -- {__XQTNAMEX__} $tmplat "$tf.dll" tmplat
-    } else {
-      if {$tclused != 1} {
-        regsub -all -- {__COMPOPT__} $tmplat "\/MD" tmplat
-        regsub -all -- {__COMPOPTD__} $tmplat "\/MDd" tmplat
-      } else {
-        regsub -all -- {__COMPOPT__} $tmplat "\/MD \/I \"\$(TCLHOME)\\include\"" tmplat
-        regsub -all -- {__COMPOPTD__} $tmplat "\/MDd \/I \"\$(TCLHOME)\\include\"" tmplat
-      }
-      regsub -all -- {__XQTNAMEX__} $tmplat "$tf.exe" tmplat
-    }
-    #puts "$tf requires  $tkused"
-    if {$tclused == 1} {
-      append tkused " -libpath:\"\$(TCLHOME)\\lib\" "
-    }
-    regsub -all -- {__TKDEP__} $tmplat $tkused tmplat
-    set files ""
-    set field1 ""
-    set field2 ""
-    set field3 ""
-    set field4 ""
-    foreach tk [LibToLinkX [woklocate -u $tkloc] $tf] {
-      append files "\!IF  \"\$(CFG)\" == \"$tf - Win32 Release\"\n"
-      append files "\"$tk - Win32 Release\" \: \n"
-      append files "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Release\" \n"
-      append files "\"$tk - Win32 ReleaseCLEAN\" \: \n"
-      append files "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Release\" RECURSE=1 CLEAN\n"
-      append files "\!ELSEIF  \"\$(CFG)\" == \"$tf - Win32 Debug\"\n"
-      append files "\"$tk - Win32 Debug\" \: \n"
-      append files "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Debug\" \n"
-      append files "\"$tk - Win32 DebugCLEAN\" \: \n"
-      append files "   \$(MAKE) \/NOLOGO \/\$(MAKEFLAGS) \/F .\\$tk.mak CFG=\"$tk - Win32 Debug\" RECURSE=1 CLEAN\n"
-      append files "\!ENDIF\n"
-
-      append field1 "\"$tk - Win32 Release\" "
-      append field2 "\"$tk - Win32 ReleaseCLEAN\" "
-      append field3 "\"$tk - Debug\" "
-      append field4 "\"$tk - Win32 DebugCLEAN\" "
-    }
-    regsub -all -- {__FILES__}  $tmplat $files  tmplat
-    regsub -all -- {__FIELD1__} $tmplat $field1 tmplat
-    regsub -all -- {__FIELD2__} $tmplat $field2 tmplat
-    regsub -all -- {__FIELD3__} $tmplat $field3 tmplat
-    regsub -all -- {__FIELD4__} $tmplat $field4 tmplat
-    regsub -all -- {__XNAM__}   $tmplat $tkloc  tmplat
-    puts $fp $tmplat
-    close $fp
-    set fout [lappend fout $fdsp]
-  }
-  return $fout
-}
-
 ;#
 ;# (((((((((((((((((((((((( AUTOMAKE/ PROJECTs )))))))))))))))))))))))
 ;#
diff --git a/src/WOKTclLib/template.mak b/src/WOKTclLib/template.mak
deleted file mode 100755
index 169d2aa..0000000
--- a/src/WOKTclLib/template.mak
+++ /dev/null
@@ -1,188 +0,0 @@
-!IF "$(CFG)" == ""
-CFG=__TKNAM__ - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to __TKNAM__ - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "__TKNAM__ - Win32 Release" && "$(CFG)" != "__TKNAM__ - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "__TKNAM__.mak" CFG="__TKNAM__ - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "__TKNAM__ - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "__TKNAM__ - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-__TCLUSED__
-__JAVAUSED__
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "__TKNAM__ - Win32 Release"
-
-OUTDIR=.\..\..\win32\bin
-INTDIR=.\..\..\win32\obj\__TKNAM__
-LIBDIR=.\..\..\win32\lib
-# Begin Custom Macros
-OutDir=.\..\..\win32\bin
-# End Custom Macros
-
-__FIELD1__	-@erase "$(INTDIR)\vc*.idb"
-        -@erase "$(INTDIR)\vc*.pdb"
-	-@erase "$(OUTDIR)\__TKNAM__.dll"
-	-@erase "..\..\win32\lib\__TKNAM__.exp"
-	-@erase "..\..\win32\lib\__TKNAM__.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-    if not exist "$(LIBDIR)/$(NULL)" mkdir "$(LIBDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WNT" /D "No_Exception" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /D "CSFDB" /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\__TKNAM__.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-__FIELD2__
-
-"$(OUTDIR)\__TKNAM__.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "__TKNAM__ - Win32 Debug"
-
-OUTDIR=.\..\..\win32\bind
-INTDIR=.\..\..\win32\objd\__TKNAM__
-LIBDIR=.\..\..\win32\libd
-# Begin Custom Macros
-OutDir=.\..\..\win32\bind
-# End Custom Macros
-
-
-__FIELD3__	-@erase "$(INTDIR)\vc*.idb"
-        -@erase "$(INTDIR)\vc*.pdb"
-	-@erase "$(OUTDIR)\__TKNAM__.dll"
-	-@erase "..\..\win32\libd\__TKNAM__.exp"
-	-@erase "..\..\win32\libd\__TKNAM__.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-    if not exist "$(LIBDIR)/$(NULL)" mkdir "$(LIBDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /D "WNT" /D "CSFDB" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\__TKNAM__.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-__FIELD4__
-
-"$(OUTDIR)\__TKNAM__.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("__TKNAM__.dep")
-!INCLUDE "__TKNAM__.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "__TKNAM__.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "__TKNAM__ - Win32 Release" || "$(CFG)" == "__TKNAM__ - Win32 Debug"
-
-__FIELD5__
-
-__FIELD6__
-
-!ENDIF 
-
diff --git a/src/WOKTclLib/template.makx b/src/WOKTclLib/template.makx
deleted file mode 100755
index f637b2e..0000000
--- a/src/WOKTclLib/template.makx
+++ /dev/null
@@ -1,233 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on __XQTNAM__.dsp
-!IF "$(CFG)" == ""
-CFG=__XQTNAM__ - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to __XQTNAM__ - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "__XQTNAM__ - Win32 Release" && "$(CFG)" != "__XQTNAM__ - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "__XQTNAM__.mak" CFG="__XQTNAM__ - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "__XQTNAM__ - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "__XQTNAM__ - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-
-!IF  "$(CFG)" == "__XQTNAM__ - Win32 Release"
-
-OUTDIR=.\..\..\win32\bin
-INTDIR=.\..\..\win32\obj\__XNAM__
-LIBDIR=.\..\..\win32\lib
-# Begin Custom Macros
-OutDir=.\..\..\win32\bin
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\__XQTNAMEX__"
-
-!ELSE 
-
-ALL : __FIELD1__ "$(OUTDIR)\__XQTNAMEX__"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :__FIELD2__ 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\__XQTNAM__.obj"
-	-@erase "$(OUTDIR)\__XQTNAMEX__"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-    if not exist "$(LIBDIR)/$(NULL)" mkdir "$(LIBDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-MTL=midl.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /W3 /GX /O2 /D __COMPOPT__ "WIN32" /D "NDEBUG" /D "No_Exception" /D "_WINDOWS" /D "WNT" /D "CSFDB" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\__XQTNAM__.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=__TKDEP__ /nologo /subsystem:console /incremental:no  /machine:IX86 /out:"$(OUTDIR)\__XQTNAMEX__" /implib:"$(LIBDIR)\__XQTNAM__.lib" /libpath:"$(LIBDIR)" 
-LINK32_OBJS= \
-	"$(INTDIR)\__XQTNAM__.obj" 
-
-"$(OUTDIR)\__XQTNAMEX__" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "__XQTNAM__ - Win32 Debug"
-
-OUTDIR=.\..\..\win32\bind
-INTDIR=.\..\..\win32\objd\__XNAM__
-LIBDIR=.\..\..\win32\libd
-# Begin Custom Macros
-OutDir=.\..\..\win32\bind
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\__XQTNAMEX__"
-
-!ELSE 
-
-ALL : __FIELD3__ "$(OUTDIR)\__XQTNAMEX__"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :__FIELD4__ 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\__XQTNAM__.obj"
-	-@erase "$(OUTDIR)\__XQTNAMEX__"
-	-@erase "$(OUTDIR)\__XQTNAM__.ilk"
-	-@erase "$(OUTDIR)\__XQTNAM__.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-    if not exist "$(LIBDIR)/$(NULL)" mkdir "$(LIBDIR)"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-MTL=midl.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /W3 /GX /Zi /Od __COMPOPTD__ /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /D "WNT" /D "CSFDB" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\__XQTNAM__.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=__TKDEP__ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\__XQTNAM__.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\__XQTNAMEX__" /implib:"$(LIBDIR)\__XQTNAM__.lib" /pdbtype:sept /libpath:"$(LIBDIR)" 
-LINK32_OBJS= \
-	"$(INTDIR)\__XQTNAM__.obj" 
-
-"$(OUTDIR)\__XQTNAMEX__" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("__XQTNAM__.dep")
-!INCLUDE "__XQTNAM__.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "__XQTNAM__.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "__XQTNAM__ - Win32 Release" || "$(CFG)" == "__XQTNAM__ - Win32 Debug"
-SOURCE=..\..\src\__XNAM__\__XQTNAM__.cxx
-
-!IF  "$(CFG)" == "__XQTNAM__ - Win32 Release"
-
-CPP_SWITCHES=/nologo  /W3 /GX /O2 __COMPOPT__ /I "..\..\inc" /I "..\..\drv\__XQTNAM__" /I "..\..\src\__XQTNAM__" /D "WIN32" /D "NDEBUG" /D "No_Exception" /D "_WINDOWS" /D "WNT" /D "CSFDB" /D "____XQTNAM___DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\__XQTNAM__.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_SWITCHES) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "__XQTNAM__ - Win32 Debug"
-
-CPP_SWITCHES=/nologo  /W3 /GX /Zi /Od __COMPOPTD__ /I "..\..\inc" /I "..\..\drv\__XQTNAM__" /I "..\..\src\__XQTNAM__" /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /D "WNT" /D "CSFDB" /D "____XQTNAM___DLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-"$(INTDIR)\__XQTNAM__.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_SWITCHES) $(SOURCE)
-
-
-!ENDIF 
-
-__FILES__
-
-!ENDIF 
-