Build files: removed a bunch of make rules for long-dead unsupported systems
...in order to unify and simplify the build. If a need to support this
ancient systems arose, these hacks may ni longer be needed (due to new
versions of tools) or the hacks would have to be written again (better)
or retrieved from SCM (worse). Time will show.
--- a/Make.proto Wed Sep 06 09:47:50 2017 +0200
+++ b/Make.proto Wed Sep 06 10:04:18 2017 +0200
@@ -50,7 +50,7 @@
# ********** OPTIONAL: MODIFY the next line ***
# additional C-libraries that should be pre-linked with the class-objects
LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
+LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
# ********** OPTIONAL: MODIFY the next line ***
@@ -60,174 +60,19 @@
OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
-
all:: preMake classLibRule postMake
-pre_objs::
+pre_objs:: glLib
postMake:: $(LIBVIEW_EXTRA_TARGETS)
-clean::
- @-mv $(OUTDIR)XWorkstation.o $(OUTDIR)XWorkstation.o.sav
- @-mv $(OUTDIR)GLXWorkstation.o $(OUTDIR)GLXWorkstation.o.sav
- @-rm -f [A-Z]*.o *.s *.s2 *.c *.H
- @-mv $(OUTDIR)XWorkstation.o.sav $(OUTDIR)XWorkstation.o
- @-mv $(OUTDIR)GLXWorkstation.o.sav $(OUTDIR)GLXWorkstation.o
- @-touch $(OUTDIR)XWorkstation.st $(OUTDIR)GLXWorkstation.st
-
-#
-# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
-# and without -Zlibview (to speedup ld.so on SGI, by avoiding conflicts)
-#
-
-XWorkstation.$(O): XWorkstation.st $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.H $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.H $(INCLUDE_TOP)/stx/libview/GraphicsDevice.H
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=XWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" \
- CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize=64000" \
- SEPINITCODE=-sepInitCode ZFLAG=
-
-xw:
- $(MAKE) XWorkstation.c \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" \
- CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize: 64000 -V" \
- SEPINITCODE=-sepInitCode ZFLAG=
-
-XWorkstation.$(SO): XWorkstation.$(O)
- $(MAKE) $(SHAREDLIBRULE) \
- LIB=XWorkstation.$(SO) \
- OBJS="XWorkstation.$(O)" \
- LOCAL_SHARED_LIBS="-L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB) "
-
-# LOCAL_SHARED_LIBS="-L$(TOP)/librun -lrun -L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_X) "
-
-
-
-__GLXWorkstation.$(O): GLXWorkstation.st $(INCLUDE_TOP)/stx/libview/XWorkstation.$(O) $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.H $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.H $(INCLUDE_TOP)/stx/libview/GraphicsDevice.H $(INCLUDE)/stc.h
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=GLXWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)" \
- SEPINITCODE=-sepInitCode ZFLAG=
- mv GLXWorkstation.$(O) __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); \
- $(CLASSLIB_LD) $(LD_REL_FLAG) -o GLXWorkstation.$(O) __GLXWorkstation.$(O) $(LIB_GL); \
- else \
- echo cp __GLXWorkstation.$(O) GLXWorkstation.$(O); \
- cp __GLXWorkstation.$(O) GLXWorkstation.$(O); \
- fi
-
glLib:
@-if [ -d ../support/VGL ]; then \
(cd ../support/VGL ; $(MAKE) ) ; \
fi
-DeviceWorkstation.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=DeviceWorkstation \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-SimpleView.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=SimpleView \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-Image.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=Image \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-#OGLWorkstation.$(O): OGLWorkstation.st
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=OGLWorkstation CC=$(CC) OPT="$(OPT)" \
-# XDEFS="-DOPENGL -I$(MESA_DIR)/include" SEPINITCODE=-sepInitCode ZFLAG=
-# $(CLASSLIB_LD) -r -o ttt.$(O) OGLWorkstation.$(O) \
-# $(MESA_DIR)/lib/libMesaGL.a \
-# $(MESA_DIR)/lib/libMesaGLU.a \
-# $(MESA_DIR)/lib/libMesaaux.a
-# mv ttt.$(O) OGLWorkstation.$(O)
-
-OGLWorkstation.$(O): GLXWorkstation.st
- cp GLXWorkstation.st OGLWorkstation.st
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=OGLWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)" \
- CC_VOGL_FLAGS="$(CC_MESA_INCLUDE) -DOPENGL -DMESA -UVGL -UGLX"\
- SEPINITCODE=-sepInitCode ZFLAG=
- $(CLASSLIB_LD) -r -o ttt.$(O) OGLWorkstation.$(O) \
- $(MESA_DIR)/lib/libMesaGL.a \
- $(MESA_DIR)/lib/libMesaGLU.a \
- $(MESA_DIR)/lib/libMesaaux.a
- mv ttt.$(O) OGLWorkstation.$(O)
- rm -f OGLWorkstation.st
-
-#ogl:
-# $(MAKE) OGLWorkstation.o XDEFS="-DOPENGL -I$(VOGL_DIR) -DSHAPE" SEPINITCODE=-sepInitCode ZFLAG=
-# mv OGLWorkstation.o ttt.o
-# $(CLASSLIB_LD) -r -o OGLWorkstation.o ttt.o \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaGL.a \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaGLU.a \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaaux.a \
-# /lib/libc.so.4
-
-#
-# on my 320H, do not compile DeviceWorkstation with -O2;
-# compiler is running out of space ...
-#
-#AIX_BIGGIES:
-# $(MAKE) GraphicsContext.$(O)
-# $(MAKE) DeviceGraphicsContext.$(O)
-# $(MAKE) OPT= DeviceWorkstation.$(O)
-# $(MAKE) OPT= XWorkstation.$(O)
-# $(MAKE) OPT= Image.$(O)
-# $(MAKE) OPT= SimpleView.$(O)
-
-#
-# prelink those - cannot mix non-shared with shared objects (sigh)
-#
-AIX_SHARED_XWORKSTATION:
- $(MAKE) GraphicsDevice.$(O) HostGraphicsDevice.$(O) DeviceWorkstation.$(O)
- $(MAKE) aix_exports LIBNAME=XWorkstation ENTRY=XWorkstation
- @-echo "__XErrorHandler__" >> XWorkstation.exp
- @-echo "__XIOErrorHandler__" >> XWorkstation.exp
- $(MAKE) XWorkstation$(O_EXT) \
- ENTRY_INIT=XWorkstation \
- AIX_LOCAL_LIBS="$(LIBX)"
-
-AIX_SHARED_GLXWORKSTATION:
- $(MAKE) GraphicsDevice.$(O) HostGraphicsDevice.$(O) DeviceWorkstation.$(O)
- $(MAKE) aix_exports LIBNAME=XWorkstation ENTRY=XWorkstation
- @-echo "__XErrorHandler__" >> XWorkstation.exp
- @-echo "__XIOErrorHandler__" >> XWorkstation.exp
- $(MAKE) GLXWorkstation$(O_EXT) \
- ENTRY_INIT=GLXWorkstation \
- AIX_LOCAL_LIBS="-bI:XWorkstation.exp $(LIB_GL) $(LIBX) -lm"
- rm -f XWorkstation.exp
-
-#
-# in (my) aix system, those cannot be compiled with
-# the optimizer - running out of space ...
-#
-AIX:: GraphicsContext.$(O) DeviceGraphicsContext.$(O) GraphicsMedium.$(O) DisplaySurface.$(O)
- $(MAKE) OPT="" SimpleView.$(O)
- $(MAKE) OPT="" Image.$(O)
- $(MAKE) $(AIX_XWORKSTATION_RULE) $(AIX_GLXWORKSTATION_RULE)
-
-#
-# on HP, big classes blow the C-preprocessor (stops with "too much defining" error)
-#
-#HP::
-#
-#HPbigFiles:
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=Color CC=$(CC) OPT="$(OPT)"
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=DeviceGraphicsContext CC=$(CC) OPT="$(OPT)"
-
--- a/stx_libview.st Wed Sep 06 09:47:50 2017 +0200
+++ b/stx_libview.st Wed Sep 06 10:04:18 2017 +0200
@@ -183,12 +183,6 @@
"Modified: / 27-09-2011 / 18:25:27 / cg"
!
-additionalDefinitions_make_dot_proto
- ^ '
-LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
-'
-!
-
additionalRules_bc_dot_mak
^ '#
@@ -213,166 +207,29 @@
^ '
postMake:: $(LIBVIEW_EXTRA_TARGETS)
-clean::
- @-mv $(OUTDIR)XWorkstation.o $(OUTDIR)XWorkstation.o.sav
- @-mv $(OUTDIR)GLXWorkstation.o $(OUTDIR)GLXWorkstation.o.sav
- @-rm -f [A-Z]*.o *.s *.s2 *.c *.H
- @-mv $(OUTDIR)XWorkstation.o.sav $(OUTDIR)XWorkstation.o
- @-mv $(OUTDIR)GLXWorkstation.o.sav $(OUTDIR)GLXWorkstation.o
- @-touch $(OUTDIR)XWorkstation.st $(OUTDIR)GLXWorkstation.st
-
-#
-# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
-# and without -Zlibview (to speedup ld.so on SGI, by avoiding conflicts)
-#
-
-XWorkstation.$(O): XWorkstation.st $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.H $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.H $(INCLUDE_TOP)/stx/libview/GraphicsDevice.H
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=XWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" \
- CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize=64000" \
- SEPINITCODE=-sepInitCode ZFLAG=
-
-xw:
- $(MAKE) XWorkstation.c \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" \
- CLASSLIB_OPT="$(CLASSLIB_OPT) -primitiveStackSize: 64000 -V" \
- SEPINITCODE=-sepInitCode ZFLAG=
-
-XWorkstation.$(SO): XWorkstation.$(O)
- $(MAKE) $(SHAREDLIBRULE) \
- LIB=XWorkstation.$(SO) \
- OBJS="XWorkstation.$(O)" \
- LOCAL_SHARED_LIBS="-L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB) "
-
-# LOCAL_SHARED_LIBS="-L$(TOP)/librun -lrun -L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_X) "
-
-
-
-__GLXWorkstation.$(O): GLXWorkstation.st $(INCLUDE_TOP)/stx/libview/XWorkstation.$(O) $(INCLUDE_TOP)/stx/libview/DeviceWorkstation.H $(INCLUDE_TOP)/stx/libview/HostGraphicsDevice.H $(INCLUDE_TOP)/stx/libview/GraphicsDevice.H $(INCLUDE)/stc.h
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=GLXWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)" \
- SEPINITCODE=-sepInitCode ZFLAG=
- mv GLXWorkstation.$(O) __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); \
- $(CLASSLIB_LD) $(LD_REL_FLAG) -o GLXWorkstation.$(O) __GLXWorkstation.$(O) $(LIB_GL); \
- else \
- echo cp __GLXWorkstation.$(O) GLXWorkstation.$(O); \
- cp __GLXWorkstation.$(O) GLXWorkstation.$(O); \
- fi
-
glLib:
@-if [ -d ../support/VGL ]; then \
(cd ../support/VGL ; $(MAKE) ) ; \
fi
-
-DeviceWorkstation.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=DeviceWorkstation \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-SimpleView.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=SimpleView \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-Image.$(O):
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=Image \
- CC="$(CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)"
-
-#OGLWorkstation.$(O): OGLWorkstation.st
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=OGLWorkstation CC=$(CC) OPT="$(OPT)" \
-# XDEFS="-DOPENGL -I$(MESA_DIR)/include" SEPINITCODE=-sepInitCode ZFLAG=
-# $(CLASSLIB_LD) -r -o ttt.$(O) OGLWorkstation.$(O) \
-# $(MESA_DIR)/lib/libMesaGL.a \
-# $(MESA_DIR)/lib/libMesaGLU.a \
-# $(MESA_DIR)/lib/libMesaaux.a
-# mv ttt.$(O) OGLWorkstation.$(O)
-
-OGLWorkstation.$(O): GLXWorkstation.st
- cp GLXWorkstation.st OGLWorkstation.st
- $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=OGLWorkstation \
- CC="$(CC)" OPT="$(OPT)" \
- CLASSLIB_CC="$(CLASSLIB_CC)" CLASSLIB_OPT="$(CLASSLIB_OPT)" \
- CC_VOGL_FLAGS="$(CC_MESA_INCLUDE) -DOPENGL -DMESA -UVGL -UGLX"\
- SEPINITCODE=-sepInitCode ZFLAG=
- $(CLASSLIB_LD) -r -o ttt.$(O) OGLWorkstation.$(O) \
- $(MESA_DIR)/lib/libMesaGL.a \
- $(MESA_DIR)/lib/libMesaGLU.a \
- $(MESA_DIR)/lib/libMesaaux.a
- mv ttt.$(O) OGLWorkstation.$(O)
- rm -f OGLWorkstation.st
-
-#ogl:
-# $(MAKE) OGLWorkstation.o XDEFS="-DOPENGL -I$(VOGL_DIR) -DSHAPE" SEPINITCODE=-sepInitCode ZFLAG=
-# mv OGLWorkstation.o ttt.o
-# $(CLASSLIB_LD) -r -o OGLWorkstation.o ttt.o \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaGL.a \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaGLU.a \
-# $(TOP)/support/MESA/Mesa1.2.5/lib/libMesaaux.a \
-# /lib/libc.so.4
-
-#
-# on my 320H, do not compile DeviceWorkstation with -O2;
-# compiler is running out of space ...
-#
-#AIX_BIGGIES:
-# $(MAKE) GraphicsContext.$(O)
-# $(MAKE) DeviceGraphicsContext.$(O)
-# $(MAKE) OPT= DeviceWorkstation.$(O)
-# $(MAKE) OPT= XWorkstation.$(O)
-# $(MAKE) OPT= Image.$(O)
-# $(MAKE) OPT= SimpleView.$(O)
-
-#
-# prelink those - cannot mix non-shared with shared objects (sigh)
-#
-AIX_SHARED_XWORKSTATION:
- $(MAKE) GraphicsDevice.$(O) HostGraphicsDevice.$(O) DeviceWorkstation.$(O)
- $(MAKE) aix_exports LIBNAME=XWorkstation ENTRY=XWorkstation
- @-echo "__XErrorHandler__" >> XWorkstation.exp
- @-echo "__XIOErrorHandler__" >> XWorkstation.exp
- $(MAKE) XWorkstation$(O_EXT) \
- ENTRY_INIT=XWorkstation \
- AIX_LOCAL_LIBS="$(LIBX)"
-
-AIX_SHARED_GLXWORKSTATION:
- $(MAKE) GraphicsDevice.$(O) HostGraphicsDevice.$(O) DeviceWorkstation.$(O)
- $(MAKE) aix_exports LIBNAME=XWorkstation ENTRY=XWorkstation
- @-echo "__XErrorHandler__" >> XWorkstation.exp
- @-echo "__XIOErrorHandler__" >> XWorkstation.exp
- $(MAKE) GLXWorkstation$(O_EXT) \
- ENTRY_INIT=GLXWorkstation \
- AIX_LOCAL_LIBS="-bI:XWorkstation.exp $(LIB_GL) $(LIBX) -lm"
- rm -f XWorkstation.exp
-
-#
-# in (my) aix system, those cannot be compiled with
-# the optimizer - running out of space ...
-#
-AIX:: GraphicsContext.$(O) DeviceGraphicsContext.$(O) GraphicsMedium.$(O) DisplaySurface.$(O)
- $(MAKE) OPT="" SimpleView.$(O)
- $(MAKE) OPT="" Image.$(O)
- $(MAKE) $(AIX_XWORKSTATION_RULE) $(AIX_GLXWORKSTATION_RULE)
-
-#
-# on HP, big classes blow the C-preprocessor (stops with "too much defining" error)
-#
-#HP::
-#
-#HPbigFiles:
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=Color CC=$(CC) OPT="$(OPT)"
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=DeviceGraphicsContext CC=$(CC) OPT="$(OPT)"
'
- "Modified: / 14-09-2011 / 13:50:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-09-2017 / 09:57:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalSharedLinkLibraries_make_dot_proto
+ "allows for additional shared libraries to be added to the make.proto file."
+
+ ^ '-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB) '
+
+ "Created: / 06-09-2017 / 09:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalTargets_make_dot_proto
+ "allows for additional targets to be added to the make.proto file."
+
+ ^ 'glLib'
+
+ "Created: / 06-09-2017 / 09:57:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
localDefines_unix