From d183ade8b302c717ac22797529e9251b5bd44387 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 29 Oct 2019 18:11:42 -0600 Subject: [PATCH] DtSvc: we can't use archive .a libs in building libDtSvc.so We were building subsets of this library as archive.a objects, then trying to combine them into a shared object. This warnings, and link failures due to the lack of 0fPIC when building the archive libraries. Now, we do not buld archive libraries, and the main libDtSvc.so library is build by adding all of the .lo file in the component subdirectories. In a future commit, we could just remove the SUBDIR builds (DtUtil1, etc) and build the sub objects directly. --- cde/lib/DtSvc/DtUtil2/Makefile.am | 2 +- cde/lib/DtSvc/Makefile.am | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cde/lib/DtSvc/DtUtil2/Makefile.am b/cde/lib/DtSvc/DtUtil2/Makefile.am index 2b0f0ec1..b94a3ce8 100644 --- a/cde/lib/DtSvc/DtUtil2/Makefile.am +++ b/cde/lib/DtSvc/DtUtil2/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtUtil2.la -libDtUtil2_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ +libDtUtil2_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE -DNLS16 \ @DT_INCDIR@ \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am index 290b8b29..312a4762 100644 --- a/cde/lib/DtSvc/Makefile.am +++ b/cde/lib/DtSvc/Makefile.am @@ -6,7 +6,6 @@ lib_LTLIBRARIES = libDtSvc.la libDtSvc_la_SOURCES = -libDtSvc_la_LIBADD = $(LIBXIN) -lXinerama DtUtil1/libDtUtil1.la \ - DtUtil2/libDtUtil2.la DtEncap/libDtEncap.la \ - DtCodelibs/libDtCodelibs.la DtXpm/libDtXpm.la -libDtSvc_la_LDFLAGS = -version-info 2:1:0 +libDtSvc_la_LIBADD = DtUtil1/*.lo DtUtil2/*.lo DtEncap/*.lo \ + DtCodelibs/*.lo DtXpm/*.lo +libDtSvc_la_LDFLAGS = -fPIC -version-info 2:1:0 -- 2.25.1