--- a/src/stx_libjava.st	Tue Aug 30 20:47:05 2011 +0000
+++ b/src/stx_libjava.st	Tue Aug 30 21:19:10 2011 +0000
@@ -215,58 +215,6 @@
     )
 ! !
 
-!stx_libjava class methodsFor:'description - compilation'!
-
-additionalLinkLibraries_bc_dot_mak
-"/    ^ '$(ZLIB) $(BZ2LIB)'
-    ^ '$(ZLIB_DIR)\$(ZLIB)'
-!
-
-additionalLinkLibraries_make_dot_proto
-    ^ '$(ZLIB_LD_ARG) $(BZ2LIB_LD_ARG)'
-!
-
-additionalRules_bc_dot_mak
-    ^ '
-$(ZLIB):
-	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
-	cd ..\..\libbasic2
-
-$(BZ2LIB):
-	cd $(BZ2LIB_DIR)
-	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
-	cd ..\..\libbasic2
-'
-!
-
-additionalRules_make_dot_proto
-    ^ '
-zlib:
-	cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
-
-bz2lib:
-	cd $(BZ2LIB_DIR); $(MAKE) $(MAKE_BZ2LIB_ARG) libbz2.a
-'
-!
-
-additionalTargets_bc_dot_mak
-"/    ^ '$(BZ2LIB) $(ZLIB)'      bz2lib doesn't work for now
-    ^ '$(ZLIB)'
-!
-
-additionalTargets_make_dot_proto
-    ^ 'bz2lib zlib'
-
-    "Created: / 05-09-2006 / 16:05:12 / cg"
-!
-
-localIncludes
-    ^ '-I$(ZLIB_DIR)'
-
-    "Created: / 06-09-2006 / 18:18:15 / cg"
-! !
-
 !stx_libjava class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -278,6 +226,7 @@
     ^ #(
         "<className> or (<className> attributes...) in load order"
         (AbstractJavaTestCase autoload)
+        ArgumentMatcher
         Byte
         (JUnitTestCaseProxy autoload)
         Java
@@ -301,12 +250,14 @@
         JavaContext
         JavaDecompiler
         JavaDescriptor
+        JavaDoesNotUnderstandException
         JavaError
         JavaEvaluator
         JavaExceptionTableEntry
         (JavaExceptionThrowerMock autoload)
         JavaField
         (JavaFieldRefTests autoload)
+        JavaInflater
         (JavaInitializedResource autoload)
         (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
@@ -317,7 +268,6 @@
         JavaLocalVariableTable
         JavaLocalVariableTableEntry
         JavaLookup
-        (JavaLookupTestsResource autoload)
         JavaMethod
         (JavaMethodRefTests autoload)
         JavaNameAndType2
@@ -338,6 +288,7 @@
         JavaRelease
         JavaResolver
         (JavaRuntimeConstantPoolTests autoload)
+        (JavaSelectorParserTests autoload)
         JavaSlotIndexCache
         JavaSourceCodeCache
         JavaSourceFileWriter
@@ -350,12 +301,17 @@
         JavaUnresolvedConstant
         JavaVM
         JavaView
-        JavaZipSupport
+        (LookupIntegrationTests autoload)
+        (LookupIntegrationTestsResource autoload)
         (LookupTests autoload)
+        MessageDescription
         PPJavaNode
+        SampleHandler
+        SelectorParser
         Short
         SmalltalkAppletContext
         SmalltalkAppletStub
+        (SmalltalkSelectorParserTests autoload)
         (TestletTestCaseProxy autoload)
         #'stx_libjava'
         JavaAnnotationArrayValue
@@ -382,12 +338,14 @@
         JavaMethodNode
         JavaMethodWithException
         JavaParser
+        JavaSelectorParser
         JavaStringRef2
         JavaTypeNode
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
         JavadocDeclarationNode
+        SmalltalkSelectorParser
         JavaArrayTypeNode
         JavaBooleanTypeNode
         JavaBothOldAndNewClassRef