From b3ef922b980de9ed8768ab00d422d2772bdc2b0e Mon Sep 17 00:00:00 2001 From: Botond Baranyi <botond.baranyi@ericsson.com> Date: Wed, 7 Oct 2020 10:45:15 +0200 Subject: [PATCH] Removed '-lbsd' from regression test makefiles, too (Bug 565893) Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com> Change-Id: Ibefd103f4fe7a90c8fe973436c65a621a8e9ecc1 --- regression_test/Makefile.regression | 12 ++++++------ regression_test/XML/XMLqualif/Makefile | 10 +++++----- regression_test/XML/xsdConverter/Makefile.converter | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/regression_test/Makefile.regression b/regression_test/Makefile.regression index 9208d2c8e..1e3d01e32 100644 --- a/regression_test/Makefile.regression +++ b/regression_test/Makefile.regression @@ -192,12 +192,12 @@ else EXESUFFIX := endif # WIN32 -SOLARIS_LIBS = -lxnet -L${XMLDIR}/lib -lxml2 -lresolv -lcurses -lbsd -ledit -SOLARIS8_LIBS = $(SOLARIS_LIBS) -lresolv -lcurses -lbsd -ledit -LINUX_LIBS = -L${XMLDIR}/lib -lxml2 -lpthread -lrt -lncurses -lbsd -ledit -FREEBSD_LIBS = -lncurses -lbsd -ledit -WIN32_LIBS = -L${XMLDIR}/lib -lxml2 -lncurses -lbsd -ledit -INTERIX_LIBS = -L${XMLDIR}/lib -lxml2 -liconv -lncurses -lbsd -ledit +SOLARIS_LIBS = -lxnet -L${XMLDIR}/lib -lxml2 -lresolv -lcurses -ledit +SOLARIS8_LIBS = $(SOLARIS_LIBS) -lresolv -lcurses -ledit +LINUX_LIBS = -L${XMLDIR}/lib -lxml2 -lpthread -lrt -lncurses -ledit +FREEBSD_LIBS = -lncurses -ledit +WIN32_LIBS = -L${XMLDIR}/lib -lxml2 -lncurses -ledit +INTERIX_LIBS = -L${XMLDIR}/lib -lxml2 -liconv -lncurses -ledit # diff --git a/regression_test/XML/XMLqualif/Makefile b/regression_test/XML/XMLqualif/Makefile index 27c9dc72f..0a0171dd5 100644 --- a/regression_test/XML/XMLqualif/Makefile +++ b/regression_test/XML/XMLqualif/Makefile @@ -127,11 +127,11 @@ TARGET = POtest$(EXESUFFIX) # Do not modify these unless you know what you are doing... # Platform specific additional libraries: # -SOLARIS_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -lbsd -ledit -SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -lbsd -ledit -LINUX_LIBS = -lxml2 -lpthread -lrt -lncurses -lbsd -ledit -FREEBSD_LIBS = -lxml2 -liconv -lncurses -lbsd -ledit -WIN32_LIBS = -lxml2 -liconv -lncurses -lbsd -ledit +SOLARIS_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -ledit +SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -ledit +LINUX_LIBS = -lxml2 -lpthread -lrt -lncurses -ledit +FREEBSD_LIBS = -lxml2 -liconv -lncurses -ledit +WIN32_LIBS = -lxml2 -liconv -lncurses -ledit # # Rules for building the executable... diff --git a/regression_test/XML/xsdConverter/Makefile.converter b/regression_test/XML/xsdConverter/Makefile.converter index 3cc718528..97fd0e57b 100644 --- a/regression_test/XML/xsdConverter/Makefile.converter +++ b/regression_test/XML/xsdConverter/Makefile.converter @@ -34,11 +34,11 @@ OBJECTS = $(GENERATED_SOURCES:.cc=.o) OTHER_FILES = Makefile -SOLARIS_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -lbsd -ledit -SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -lbsd -ledit -LINUX_LIBS = -lxml2 -lpthread -lrt -lncurses -lbsd -ledit -FREEBSD_LIBS = -lxml2 -lncurses -lbsd -ledit -WIN32_LIBS = -lxml2 -lncurses -lbsd -ledit +SOLARIS_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -ledit +SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -lresolv -lcurses -ledit +LINUX_LIBS = -lxml2 -lpthread -lrt -lncurses -ledit +FREEBSD_LIBS = -lxml2 -lncurses -ledit +WIN32_LIBS = -lxml2 -lncurses -ledit all: $(TARGET) ; -- GitLab