--- a/JavaClassReader.st	Sat May 18 23:03:23 2013 +0100
+++ b/JavaClassReader.st	Mon May 20 23:58:01 2013 +0100
@@ -110,7 +110,6 @@
     "Created: 3.8.1997 / 18:17:21 / cg"
 ! !
 
-
 !JavaClassReader class methodsFor:'constants'!
 
 fileMajorVersions
@@ -491,7 +490,7 @@
     ^nil
 
     "Created: / 03-12-2012 / 22:47:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-02-2013 / 16:25:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-05-2013 / 23:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 readClass: className ignoring: classesBeingLoadedOrNil classPath: classPath 

--- a/Make.proto	Sat May 18 23:03:23 2013 +0100
+++ b/Make.proto	Mon May 20 23:58:01 2013 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= libs experiments tools
+SUBDIRS= tools libs experiments
 
 
 # subdirectories where Makefiles are to be made:

--- a/bmake.bat	Sat May 18 23:03:23 2013 +0100
+++ b/bmake.bat	Mon May 20 23:58:01 2013 +0100
@@ -10,6 +10,13 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call bmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/libs
 @echo "***********************************"
 @cd libs
@@ -23,11 +30,4 @@
 @call bmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/tools
-@echo "***********************************"
-@cd tools
-@call bmake %1 %2
-@cd ..
 
-

--- a/lccmake.bat	Sat May 18 23:03:23 2013 +0100
+++ b/lccmake.bat	Mon May 20 23:58:01 2013 +0100
@@ -6,6 +6,13 @@
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call lccmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/libs
 @echo "***********************************"
 @cd libs
@@ -19,11 +26,4 @@
 @call lccmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/tools
-@echo "***********************************"
-@cd tools
-@call lccmake %1 %2
-@cd ..
 
-

--- a/libjava.rc	Sat May 18 23:03:23 2013 +0100
+++ b/libjava.rc	Mon May 20 23:58:01 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Sat, 18 May 2013 22:01:47 GMT\0"
+      VALUE "ProductDate", "Mon, 20 May 2013 22:52:32 GMT\0"
     END
 
   END

--- a/mingwmake.bat	Sat May 18 23:03:23 2013 +0100
+++ b/mingwmake.bat	Mon May 20 23:58:01 2013 +0100
@@ -14,6 +14,13 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call mingwmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/libs
 @echo "***********************************"
 @cd libs
@@ -27,11 +34,4 @@
 @call mingwmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/tools
-@echo "***********************************"
-@cd tools
-@call mingwmake %1 %2
-@cd ..
 
-

--- a/stx_libjava.st	Sat May 18 23:03:23 2013 +0100
+++ b/stx_libjava.st	Mon May 20 23:58:01 2013 +0100
@@ -193,9 +193,9 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
+        #'stx:libjava/tools'
         #'stx:libjava/libs'
         #'stx:libjava/experiments'
-        #'stx:libjava/tools'
     )
 ! !
 

--- a/vcmake.bat	Sat May 18 23:03:23 2013 +0100
+++ b/vcmake.bat	Mon May 20 23:58:01 2013 +0100
@@ -18,6 +18,13 @@
 
 
 @echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call vcmake %1 %2
+@cd ..
+
+@echo "***********************************"
 @echo "Buildung stx/libjava/libs
 @echo "***********************************"
 @cd libs
@@ -31,11 +38,4 @@
 @call vcmake %1 %2
 @cd ..
 
-@echo "***********************************"
-@echo "Buildung stx/libjava/tools
-@echo "***********************************"
-@cd tools
-@call vcmake %1 %2
-@cd ..
 
-