--- a/Make.proto	Fri Aug 18 16:07:00 2006 +0200
+++ b/Make.proto	Fri Aug 18 16:28:37 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.10 2005-08-12 16:40:46 cg Exp $
+# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.11 2006-08-18 14:28:36 cg Exp $
 #
 # -- Make.proto created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:28'
 #
@@ -67,6 +67,7 @@
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
 
+PACKAGE=$(MODULE):$(MODULE_DIR)
 STCLOCALOPT=-I. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALINCLUDES) $(LOCALDEFINES) -H. '-P$(PACKAGE)' '-Z$(LIBNAME)' $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 
 # ********** OPTIONAL: MODIFY the next line ***

--- a/Make.spec	Fri Aug 18 16:07:00 2006 +0200
+++ b/Make.spec	Fri Aug 18 16:28:37 2006 +0200
@@ -1,11 +1,10 @@
-# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.2 2006-08-18 14:05:31 cg Exp $
+# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.3 2006-08-18 14:28:37 cg Exp $
 #
 # -- Make.proto created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:28'
 #
 MODULE=stx
 MODULE_DIR=libjava
 LIBNAME=libstx_libjava
-PACKAGE=$(MODULE):$(MODULE_DIR)
 
 
 OBJS= \

--- a/bc.mak	Fri Aug 18 16:07:00 2006 +0200
+++ b/bc.mak	Fri Aug 18 16:28:37 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.8 2005-12-22 16:55:32 cg Exp $
+# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.9 2006-08-18 14:28:37 cg Exp $
 #
 # -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'
 #
@@ -82,6 +82,7 @@
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
 
+PACKAGE=$(MODULE):$(MODULE_DIR)
 STCLOCALOPT=-I. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALINCLUDES) $(LOCALDEFINES) -H. -package=$(PACKAGE) -varPrefix=$(LIBNAME) $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 
 # ********** OPTIONAL: MODIFY the next line ***

--- a/libInit.cc	Fri Aug 18 16:07:00 2006 +0200
+++ b/libInit.cc	Fri Aug 18 16:28:37 2006 +0200
@@ -1,132 +1,71 @@
 /*
- * $Header: /cvs/stx/stx/libjava/libInit.cc,v 1.8 2011/08/18 18:42:48 vrany Exp $
- *
- * DO NOT EDIT
- * automagically generated from the projectDefinition: stx_libjava.
+ * DO NOT EDIT 
+ * automagically generated from Make.proto (by make libInit.cc)
  */
 #define __INDIRECTVMINITCALLS__
 #include <stc.h>
-
+#define INIT_TEXT_SECT /* as nothing */
 #ifdef WIN32
 # pragma codeseg INITCODE "INITCODE"
-#endif
-
-#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
-DLL_EXPORT void _libstx_libjava_Init() INIT_TEXT_SECTION;
-// DLL_EXPORT void _libstx_libjava_InitDefinition() INIT_TEXT_SECTION;
+#else /* not WIN32 */
+# if defined(__GNUC__) && !defined(NO_SECTION_ATTRIBUTES)
+#  if (__GNUC__  == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ > 2
+#   undef INIT_TEXT_SECT
+#   define INIT_TEXT_SECT __attribute__((section(".stxitext")))
+#  endif
+# endif /* not GNUC */
+#endif /* not WIN32 */
+#ifdef INIT_TEXT_SECT
+extern void _libstx_libjava_Init() INIT_TEXT_SECT;
 #endif
-
-// void _libstx_libjava_InitDefinition(pass, __pRT__, snd)
-// OBJ snd; struct __vmData__ *__pRT__; {
-// __BEGIN_PACKAGE2__("libstx_libjava__DFN", _libstx_libjava_InitDefinition, "stx:libjava");
-// _stx_137libjava_Init(pass,__pRT__,snd);
-
-// __END_PACKAGE__();
-// }
-
 void _libstx_libjava_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libstx_libjava", _libstx_libjava_Init, "stx:libjava");
-_Byte_Init(pass,__pRT__,snd);
+_JavaBehavior_Init(pass,__pRT__,snd);
+_JavaClass_Init(pass,__pRT__,snd);
 _Java_Init(pass,__pRT__,snd);
-_JavaAnnotation_Init(pass,__pRT__,snd);
-_JavaAnnotationContainer_Init(pass,__pRT__,snd);
-_JavaAnnotationDefault_Init(pass,__pRT__,snd);
-_JavaAnnotationDictionary_Init(pass,__pRT__,snd);
-_JavaAnnotationValue_Init(pass,__pRT__,snd);
-_JavaArray_Init(pass,__pRT__,snd);
-_JavaBehavior_Init(pass,__pRT__,snd);
-_JavaByteCodeProcessor_Init(pass,__pRT__,snd);
+_JavaRef_Init(pass,__pRT__,snd);
+_JavaClassRef_Init(pass,__pRT__,snd);
 _JavaClassReader_Init(pass,__pRT__,snd);
+_JavaClassPointerRef_Init(pass,__pRT__,snd);
 _JavaConstantPool_Init(pass,__pRT__,snd);
 _JavaContext_Init(pass,__pRT__,snd);
-_JavaDecompiler_Init(pass,__pRT__,snd);
-_JavaDescriptor_Init(pass,__pRT__,snd);
-_JavaError_Init(pass,__pRT__,snd);
-_JavaEvaluator_Init(pass,__pRT__,snd);
 _JavaExceptionTableEntry_Init(pass,__pRT__,snd);
 _JavaField_Init(pass,__pRT__,snd);
-_JavaInflater_Init(pass,__pRT__,snd);
-_JavaJavadocNode_Init(pass,__pRT__,snd);
-_JavaLanguage_Init(pass,__pRT__,snd);
-_JavaLibraries_Init(pass,__pRT__,snd);
+_JavaFieldref_Init(pass,__pRT__,snd);
+_JavaMethodref_Init(pass,__pRT__,snd);
 _JavaLocalVariableTable_Init(pass,__pRT__,snd);
 _JavaLocalVariableTableEntry_Init(pass,__pRT__,snd);
-_JavaLookup_Init(pass,__pRT__,snd);
 _JavaMethod_Init(pass,__pRT__,snd);
-_JavaNameAndType2_Init(pass,__pRT__,snd);
-_JavaNativeMemory_Init(pass,__pRT__,snd);
-_JavaNode_Init(pass,__pRT__,snd);
+_JavaMethodWithBreakpoint_Init(pass,__pRT__,snd);
+_JavaMethodWithException_Init(pass,__pRT__,snd);
+_JavaMethodWithHandler_Init(pass,__pRT__,snd);
+_JavaInterfaceMethodref_Init(pass,__pRT__,snd);
+_JavaNameandType_Init(pass,__pRT__,snd);
+_JavaNativeMethod_Init(pass,__pRT__,snd);
 _JavaObject_Init(pass,__pRT__,snd);
-_JavaObjectDictionary_Init(pass,__pRT__,snd);
-_JavaPackage_Init(pass,__pRT__,snd);
-_JavaParseResult_Init(pass,__pRT__,snd);
-_JavaPopUpView_Init(pass,__pRT__,snd);
 _JavaProcess_Init(pass,__pRT__,snd);
-_JavaRef2_Init(pass,__pRT__,snd);
-_JavaRelease_Init(pass,__pRT__,snd);
-_JavaResolver_Init(pass,__pRT__,snd);
+_JavaBuiltInClassPointerRef_Init(pass,__pRT__,snd);
 _JavaSlotIndexCache_Init(pass,__pRT__,snd);
-_JavaSourceCodeCache_Init(pass,__pRT__,snd);
-_JavaSourceFileWriter_Init(pass,__pRT__,snd);
-_JavaStartup_Init(pass,__pRT__,snd);
-_JavaTestsLoader_Init(pass,__pRT__,snd);
+_JavaUnresolvedConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedClassConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedRefConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedMethodrefConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedInterfaceMethodrefConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedFieldrefConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedNameandTypeConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedSTArrayConstant_Init(pass,__pRT__,snd);
+_JavaUnresolvedStringConstant_Init(pass,__pRT__,snd);
+_JavaVM_Init(pass,__pRT__,snd);
 _JavaTopView_Init(pass,__pRT__,snd);
-_JavaUnresolvedConstant_Init(pass,__pRT__,snd);
-_JavaVM_Init(pass,__pRT__,snd);
-_JavaView_Init(pass,__pRT__,snd);
-_PPJavaNode_Init(pass,__pRT__,snd);
-_Short_Init(pass,__pRT__,snd);
+_JavaPopUpView_Init(pass,__pRT__,snd);
 _SmalltalkAppletContext_Init(pass,__pRT__,snd);
 _SmalltalkAppletStub_Init(pass,__pRT__,snd);
-_stx_137libjava_Init(pass,__pRT__,snd);
-_JavaAnnotationArrayValue_Init(pass,__pRT__,snd);
-_JavaAnnotationClassValue_Init(pass,__pRT__,snd);
-_JavaAnnotationEnumValue_Init(pass,__pRT__,snd);
-_JavaAnnotationNestedAnnotationValue_Init(pass,__pRT__,snd);
-_JavaAnnotationPrimitiveValue_Init(pass,__pRT__,snd);
-_JavaByteCodeDisassembler_Init(pass,__pRT__,snd);
+_JavaAppletComponentSpec_Init(pass,__pRT__,snd);
+_UIGalleryJavaEntry_Init(pass,__pRT__,snd);
+_JavaView_Init(pass,__pRT__,snd);
+_JavaDecompiler_Init(pass,__pRT__,snd);
 _JavaByteCodeEnumerator_Init(pass,__pRT__,snd);
-_JavaByteCodeInterpreter_Init(pass,__pRT__,snd);
-_JavaClass_Init(pass,__pRT__,snd);
-_JavaClassAnnotationContainer_Init(pass,__pRT__,snd);
-_JavaClassContentRef2_Init(pass,__pRT__,snd);
-_JavaClassRef2_Init(pass,__pRT__,snd);
 _JavaEmbeddedFrameView_Init(pass,__pRT__,snd);
-_JavaFieldAnnotationContainer_Init(pass,__pRT__,snd);
-_JavaFieldDescriptor_Init(pass,__pRT__,snd);
-_JavaFormalParameterNode_Init(pass,__pRT__,snd);
-_JavaInvalidRefError_Init(pass,__pRT__,snd);
-_JavaMethodAnnotationContainer_Init(pass,__pRT__,snd);
-_JavaMethodDeclarationNode_Init(pass,__pRT__,snd);
-_JavaMethodDeclaratorNode_Init(pass,__pRT__,snd);
-_JavaMethodDescriptor_Init(pass,__pRT__,snd);
-_JavaMethodNode_Init(pass,__pRT__,snd);
-_JavaMethodWithException_Init(pass,__pRT__,snd);
-_JavaParser_Init(pass,__pRT__,snd);
-_JavaStringRef2_Init(pass,__pRT__,snd);
-_JavaTypeNode_Init(pass,__pRT__,snd);
-_JavaUnhandledExceptionError_Init(pass,__pRT__,snd);
-_JavaUnresolvedClassConstant_Init(pass,__pRT__,snd);
-_JavaUnresolvedStringConstant_Init(pass,__pRT__,snd);
-_JavadocDeclarationNode_Init(pass,__pRT__,snd);
-_JavaArrayTypeNode_Init(pass,__pRT__,snd);
-_JavaBooleanTypeNode_Init(pass,__pRT__,snd);
-_JavaBothOldAndNewClassRef_Init(pass,__pRT__,snd);
-_JavaByteCodeSteppableInterpreter_Init(pass,__pRT__,snd);
-_JavaCharTypeNode_Init(pass,__pRT__,snd);
-_JavaClassOrInterfaceTypeNode_Init(pass,__pRT__,snd);
-_JavaDoubleTypeNode_Init(pass,__pRT__,snd);
-_JavaFieldRef2_Init(pass,__pRT__,snd);
-_JavaFloatTypeNode_Init(pass,__pRT__,snd);
-_JavaIntTypeNode_Init(pass,__pRT__,snd);
-_JavaLongTypeNode_Init(pass,__pRT__,snd);
-_JavaMethodRef2_Init(pass,__pRT__,snd);
-_JavaMethodWithHandler_Init(pass,__pRT__,snd);
-_JavaVoidTypeNode_Init(pass,__pRT__,snd);
-_JavaInterfaceMethodRef2_Init(pass,__pRT__,snd);
-_JavaNativeMethod_Init(pass,__pRT__,snd);
-
-_stx_137libjava_extensions_Init(pass,__pRT__,snd);
 __END_PACKAGE__();
 }

--- a/nt.mak	Fri Aug 18 16:07:00 2006 +0200
+++ b/nt.mak	Fri Aug 18 16:28:37 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Attic/nt.mak,v 1.8 2005-12-22 16:55:32 cg Exp $
+# $Header: /cvs/stx/stx/libjava/Attic/nt.mak,v 1.9 2006-08-18 14:28:37 cg Exp $
 #
 # -- nt.mak created from project at 'From Smalltalk/X, Version:3.5.5 on 8-nov-1999 at 21:44:36'
 #
@@ -82,6 +82,7 @@
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
 
+PACKAGE=$(MODULE):$(MODULE_DIR)
 STCLOCALOPT=-I. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALINCLUDES) $(LOCALDEFINES) -H. -package=$(PACKAGE) -varPrefix=$(LIBNAME) $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 
 # ********** OPTIONAL: MODIFY the next line ***