--- a/Make.proto Fri Aug 18 16:05:38 2006 +0200
+++ b/Make.proto Sat Aug 19 14:04:59 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.138 2006-08-18 14:05:36 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.139 2006-08-19 12:04:59 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -11,6 +11,7 @@
SMALLLIBNAME=libview_small
STCOPT=$(LIBVIEW_STCOPT)
ZFLAG=-varPrefix=$(LIBNAME)
+PACKAGE=$(MODULE):$(MODULE_DIR)
STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) $(ZFLAG)
# STCLOCALOPT='-package=$(PACKAGE)' $(SEPINITCODE) $(ZFLAG)
LINKOBJRULE=$(SEPINITLINKOBJRULE)
@@ -101,7 +102,7 @@
$(OUTDIR)ViewStyle.$(O) \
$(OUTDIR)Depth16Image.$(O) \
$(OUTDIR)Depth32Image.$(O) \
- $(OUTDIR)ImageMask.$(O) \
+ $(OUTDIR)ImageMask.$(O) \
$(OUTDIR)OpenGLConstants.$(O)
OBJS = \
@@ -165,7 +166,7 @@
@-rm -f *.so *.o *.c *.H classList.stc abbrev.stc
#
-# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
+# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
# and without -Zlibview (to speedup ld.so on SGI, by avoiding conflicts)
#
@@ -190,7 +191,7 @@
SEPINITCODE=-sepInitCode ZFLAG=
mv GLXWorkstation.$(O) __GLXWorkstation.$(O)
-GLXWorkstation.$(O): glLib __GLXWorkstation.$(O)
+GLXWorkstation.$(O): glLib __GLXWorkstation.$(O)
@if [ "$(NO_PRELINK_LIBGL)" = "" ]; \
then\
echo $(CLASSLIB_LD) $(LD_REL_FLAG) -o GLXWorkstation.$(O) __GLXWorkstation.$(O) $(LIB_GL); \
@@ -328,5 +329,5 @@
fi; \
done;
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
# ENDMAKEDEPEND --- do not remove this line
--- a/bc.def Fri Aug 18 16:05:38 2006 +0200
+++ b/bc.def Sat Aug 19 14:04:59 2006 +0200
@@ -4,4 +4,4 @@
SEGMENTS
INITCODE PRELOAD DISCARDABLE
EXPORTS
- __libview_Init @1
+ __libstx_libview_Init @1
--- a/bc.mak Fri Aug 18 16:05:38 2006 +0200
+++ b/bc.mak Sat Aug 19 14:04:59 2006 +0200
@@ -2,7 +2,7 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libview/bc.mak,v 1.46 2006-08-08 09:35:31 cg Exp $
+# $Header: /cvs/stx/stx/libview/bc.mak,v 1.47 2006-08-19 12:04:59 cg Exp $
#
TOP=..
#
@@ -10,12 +10,12 @@
#
!INCLUDE Make.spec
-LIBNAME=libview
LIB_BASE_LD_ARG=$(LIBVIEW_BASE_LD_ARG)
+PACKAGE=$(MODULE):$(MODULE_DIR)
STCOPT="+optinline -warnNonStandard"
STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
#STCLOCALOPT="-package=stx:libview +commonSymbols -varPrefix=libview"
-RESFILES=$(LIBNAME).res
+RESFILES=libview.res
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
--- a/nt.def Fri Aug 18 16:05:38 2006 +0200
+++ b/nt.def Sat Aug 19 14:04:59 2006 +0200
@@ -1,10 +1,10 @@
-LIBRARY libview
+LIBRARY stx_libview
DESCRIPTION 'Smalltalk/X View classes'
VERSION 3.5
-CODE EXECUTE READ
+CODE EXECUTE READ
DATA READ WRITE
SECTIONS
- INITCODE READ EXECUTE
+ INITCODE READ EXECUTE
INITDATA READ WRITE
-EXPORTS
- _libview_Init
+EXPORTS
+ _stx_libview_Init
--- a/nt.mak Fri Aug 18 16:05:38 2006 +0200
+++ b/nt.mak Sat Aug 19 14:04:59 2006 +0200
@@ -2,7 +2,7 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.46 2006-08-08 09:35:31 cg Exp $
+# $Header: /cvs/stx/stx/libview/Attic/nt.mak,v 1.47 2006-08-19 12:04:59 cg Exp $
#
TOP=..
#
@@ -10,12 +10,12 @@
#
!INCLUDE Make.spec
-LIBNAME=libview
LIB_BASE_LD_ARG=$(LIBVIEW_BASE_LD_ARG)
+PACKAGE=$(MODULE):$(MODULE_DIR)
STCOPT="+optinline -warnNonStandard"
STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
#STCLOCALOPT="-package=stx:libview +commonSymbols -varPrefix=libview"
-RESFILES=$(LIBNAME).res
+RESFILES=libview.res
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
--- a/ntw.mak Fri Aug 18 16:05:38 2006 +0200
+++ b/ntw.mak Sat Aug 19 14:04:59 2006 +0200
@@ -1,5 +1,5 @@
#
-# $Header: /cvs/stx/stx/libview/Attic/ntw.mak,v 1.14 2005-12-22 17:41:12 cg Exp $
+# $Header: /cvs/stx/stx/libview/Attic/ntw.mak,v 1.15 2006-08-19 12:04:59 cg Exp $
#
TOP=..
@@ -7,10 +7,10 @@
!INCLUDE $(TOP)\rules\stdHeader_nt
LIBNAME=WinWorkstation
-PACKAGE=stx:libview
-RESFILES=$(LIBNAME).res
+RESFILES=WinWorkstation.res
#LIB_BASE_LD_ARG=$(WINWORKSTAT_BASE_LD_ARG)
+PACKAGE=$(MODULE):$(MODULE_DIR)
STCLOCALOPT= -warnNonStandard -staticMethods "-package=$(PACKAGE)" $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE)
STCFLAGS_WW=-H$(STX_INCDIR) -staticMethods "-package=(stx:libview)" $(COMMONSYMBOLS)
--- a/ntx.mak Fri Aug 18 16:05:38 2006 +0200
+++ b/ntx.mak Sat Aug 19 14:04:59 2006 +0200
@@ -1,5 +1,5 @@
#
-# $Header: /cvs/stx/stx/libview/ntx.mak,v 1.15 2005-12-22 17:41:12 cg Exp $
+# $Header: /cvs/stx/stx/libview/ntx.mak,v 1.16 2006-08-19 12:04:59 cg Exp $
#
TOP=..
@@ -7,12 +7,12 @@
!INCLUDE $(TOP)\rules\stdHeader_nt
LIBNAME=XWorkstation
-PACKAGE=stx:libview
#LIB_BASE_LD_ARG=$(XWORKSTAT_BASE_LD_ARG)
+PACKAGE=$(MODULE):$(MODULE_DIR)
STCLOCALOPT= -warnNonStandard -staticMethods "-package=$(PACKAGE)" $(COMMONSYMBOLS) +optspace2 $(SEPINITCODE)
STCFLAGS_WW=-H$(STX_INCDIR) -staticMethods "-package=(stx:libview)" $(COMMONSYMBOLS)
-RESFILES=$(LIBNAME).res
+RESFILES=XWorkstation.res
ALL: xlibs $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll