--- a/makelib/config.make Wed Jul 31 13:30:49 2019 +0000
+++ b/makelib/config.make Sun Aug 04 21:26:24 2019 +0000
@@ -100,12 +100,9 @@
-Llib -L/usr/local/lib -L/usr/X11/lib -L/usr/lib \
-Wl,-z,now,-Bsymbolic,-rpath,'$$ORIGIN',-rpath,'$$ORIGIN/lib',-rpath,'$$ORIGIN/../lib'
-# linker for classlib object files, i.e., for example libstx_libbasic.o. This single partially-linked
-# object file is later linked into a shared library.
-CLASSLIB_LD=ld
-
# lex (can be replaced by flex)
LEX=lex
+LEX_FLAGS=--noyywrap
# yacc (can be replaced by bison)
YACC=yacc
@@ -240,7 +237,8 @@
STC_CC=$(CC)
STC_LD=$(LD)
STC_CFLAGS=$(CFLAGS)
-STC_LEXLIB=-ll
+STC_OPT=$(OPT)
+STC_LIBS=$(MATHLIB)
# compiler and optimizer flags to compile main.o
# default is to use the same compiler as for classes
@@ -252,29 +250,20 @@
# default is to use the same compiler as for classes
LIBRUN_CC=$(CC)
+LIBRUN_LD=$(LD)
+LIBRUN_CFLAGS=$(CFLAGS)
LIBRUN_OPT=$(OPT)
-LIBRUN_SPECIAL_OPT=$(LIBRUN_OPT)
-
-FFI_CC=$(CC)
-FFI_LD=$(LD)
-# if ffi.h is to be included from somewhere else...
-FFI_INCLUDE=
-
-# compiler to use for big-files
-# default is to use the same compiler as for other classes
-
-BIGFILE_CC=$(CC)
-
-# compiler to use for libjpeg
-# (only needed for hp, where standard cc cannot compile libjpeg)
+LIBRUN_LIBS=$(LIBS)
# compiler to use for class libraries
# the only system, where this is different is (currently) hpux_
# (their cc crashes for some big files - sigh)
CLASSLIB_CC=$(CC)
+CLASSLIB_LD=ld
+CLASSLIB_CFLAGS=$(CFLAGS)
CLASSLIB_OPT=$(OPT)
-STC_OPT=$(OPT)
+CLASSLIB_LIBS=$(LIBS)
# compiler to use for particular class libraries
LIBBASIC_CC=$(CLASSLIB_CC)
@@ -1105,12 +1094,4 @@
POST_LD_ACTION=emptyRule
-BIG_STFILE_RULE=__NORMAL_RULE__
-VERYBIG_STFILE_RULE=__NORMAL_RULE__
-LONGNAME_RULE=__NORMAL_RULE__
-
-__NORMAL_RULE__:
- $(MAKE) $(O_RULE) STFILE=$(BIG_FILE) CC="$(CC)" STC_OPT="$(STC_OPT)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" XDEFS="$(XDEFS)"
-
-
#------------------ end of COMMON/defines ---------------------