*** mkfilegen.tcl	Thu Jan  4 06:56:02 2001
--- mkfilegen.tcl.origin	Mon Sep 11 12:48:34 2000
*************** itcl_class MakefileGen {
*** 33,39 ****
      # private date members
      protected b_target ""     ; # Build target object
      protected toolchain ""    ; # Use this toolchain
!     protected tooljava  ""    ;
  
      method constructor { target_name {tool_chain ""} {args "" }} {
  
--- 33,39 ----
      # private date members
      protected b_target ""     ; # Build target object
      protected toolchain ""    ; # Use this toolchain
! 
  
      method constructor { target_name {tool_chain ""} {args "" }} {
  
*************** itcl_class MakefileGen {
*** 283,291 ****
      method WriteMacroLINKER { file_d } {
          set linker [$b_target GetLinkerLocation]
          puts $file_d "LINKER = $linker"
- 	if { $linker == "javacc" } {
- 	      set tooljava "true"
-         }
  	
          set linkerflags [$b_target GetUserLinkFlags]
          puts $file_d "LINKER_FLAGS = $linkerflags"
--- 283,288 ----
*************** itcl_class MakefileGen {
*** 343,353 ****
          # Make the rule
  	puts $file_d "\nclean:"
  	foreach objext $objexts {
! 	    if { $tooljava == "true"} {
! 	      puts $file_d "\trm -f *.class"    
! 	    } else {
!               puts $file_d "\trm -f *$objext"
! 	    }
          }
  	     
          puts $file_d "\trm -f $outputfile"
--- 340,346 ----
          # Make the rule
  	puts $file_d "\nclean:"
  	foreach objext $objexts {
!             puts $file_d "\trm -f *$objext"
          }
  	     
          puts $file_d "\trm -f $outputfile"