diff -r 481556cfa16d -r 8de3e1d78d6a makelib/config-linux-gnu.make --- a/makelib/config-linux-gnu.make Tue Jun 19 21:26:26 2018 +0100 +++ b/makelib/config-linux-gnu.make Thu Jun 21 08:07:41 2018 +0000 @@ -10,22 +10,7 @@ CPUINTERN_H=$(INCLUDE)/linuxIntern.h OS=-DLINUX -#OPTIONAL_DL_LIB=-ldl -#OPTIONAL_LIBDL_TARGET=libdld - - - MAKEFILE_EXTENSION=linux-elf - -# ALL_TARGET=LINUX_i386_ELF - -MAKEFLAGS += --no-print-directory -MAKE_INCLUDE=include -INSTALL=install -INSTALL_BIN_CMD=install -s -m 0755 -INSTALL_SCRIPT_CMD=install -m 0755 -COMPRESSOR=gzip -COMPRESSED_FILETYPE=targz SETUP_RULE=setup_linux # We need to use at most GCC 6.x, some code may fail to compile @@ -40,59 +25,3 @@ CC = gcc-4 endif endif - - -# -# use static librt for clock_gettime(). -# dynamic librt causes libpthread to be loaded that does not -# work with stx' stack layout -# - -OTHERLIBS=-ldl -Wl,-Bstatic,-lrt,-Bdynamic -OTHERLIBS=-ldl -lrt -OTHERLIBS=-ldl -lrt -lc -STATIC_OTHERLIBS= -LDFLAGS=-Llib -L/usr/local/lib -L/usr/X11/lib \ - -Wl,-z,now,-rpath,'$$ORIGIN',-rpath,'$$ORIGIN/lib',-rpath,'$$ORIGIN/../lib',--wrap=memcpy - -SPECIAL_LIBRUN_RULE=allLINUX - - -FORCE_LINK_LIBRUN=1 - -# mhm - these should now only be in libview! - - -ARCH_LIBSNMP=$(TOP)/libsnmp -ARCH_CLASSLIBDIRS=$(ARCH_LIBSNMP) - - -# -# a netsnmp library -# -# if already in /usr/lib: -# DYNAMIC_LINK_LIB_NETSNMP=-lnetsnmp -# STATIC_LINK_LIB_NETSNMP= -# TARGET_LIB_NETSNMP= -# -# if a local one should be built and used: -DYNAMIC_LINK_LIB_NETSNMP=-L$(NETSNMP_LIBDIR)/.libs -L$(NETSNMP_LIBDIR) $(NETSNMP_LIBDIR)/.libs/libnetsnmp.a -lrt -STATIC_LINK_LIB_NETSNMP= -TARGET_LIB_NETSNMP=snmplib - - -STATIC_LIB_X =$(X_LIB_DIR)/libX11.a -STATIC_LIB_XEXT=$(X_LIB_DIR)/libXext.a -STATIC_LIB_XT =$(X_LIB_DIR)/libXt.a -STATIC_LIB_XAW =$(X_LIB_DIR)/libXaw.a -STATIC_LIB_XMU =$(X_LIB_DIR)/libXmu.a - -# the following defs are for using the system's usb lib (only needed in some apps); -USB_LIB_DIR= -USB_LIB_ARG=-lusb -USB_LIB_DIR_ARG=-L/usr/lib -USB_MAKE_TARGET= - -MATRIXLOCK_DIR=$(TOP)/../exept/setup/ml -MATRIXLOCK_LIB_ARG=-L$(MATRIXLOCK_DIR)/lib -lmxlin260 -lusb -#------------------ end of linux-elf/COMMON/defines ---------------------