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.

diff --git a/cde/lib/DtSvc/DtUtil2/Makefile.am b/cde/lib/DtSvc/DtUtil2/Makefile.am
index 2b0f0ec121365d6c85d1522e94f0409f03b754e1..b94a3ce81ff6bacbe13febc041b6d534aac22f3f 100644 (file)
--- 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 290b8b29c109efc0cea5c9c17e9ad2695070394b..312a476253aee0bfe2b87bfb1dc379c0ea3a9574 100644 (file)
--- 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