diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2010-02-17 12:52:46 -0800 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-02-17 12:52:46 -0800 |
commit | a282632401e2f17430776294178e14edfd255edb (patch) | |
tree | 4dfb935a5cde4aa00fa2347dbb36e532e2c9d7a2 /xts5 | |
parent | 868b8c8703842c2b74f370212708f56134afdbcb (diff) |
xts5: Use shared library modules to decrease test program size
Linking the xts libraries statically into each test program results in a
massive size for the collection of programs. The libraries have been
changed to private libtool modules that default to shared, resulting in
a much smaller installed size.
One consequence of linking to shared objects is that the linker errors
on undefined extern variables. The obsolete and unused startup routines
in linkstart.c had one of these, so they have been removed from the
build.
Next is to create the tet library shared.
Diffstat (limited to 'xts5')
30 files changed, 109 insertions, 97 deletions
diff --git a/xts5/Makefile.am b/xts5/Makefile.am index 44608b69..f4de7d9c 100644 --- a/xts5/Makefile.am +++ b/xts5/Makefile.am @@ -1,6 +1,6 @@ include common.mk -SUBDIRS = . src fonts scenarios Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 \ +SUBDIRS = . fonts src scenarios Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 \ Xlib7 Xlib8 Xlib9 Xlib10 Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 \ Xlib16 Xlib17 XIproto XI diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am index e5d219d0..2364f2fa 100644 --- a/xts5/XI/Makefile.am +++ b/xts5/XI/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am index 25b147b5..32002006 100644 --- a/xts5/XIproto/Makefile.am +++ b/xts5/XIproto/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/libproto/libXst.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/libproto/libXst.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am index 8a778133..1d72573f 100644 --- a/xts5/Xlib10/Makefile.am +++ b/xts5/Xlib10/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am index f2a56c1a..4d4834f3 100644 --- a/xts5/Xlib11/Makefile.am +++ b/xts5/Xlib11/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am index 0893d03a..b215452e 100644 --- a/xts5/Xlib12/Makefile.am +++ b/xts5/Xlib12/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -49,8 +49,8 @@ tprogs = \ # Auxiliary programs run from tests nobase_testprog_PROGRAMS += XDisplayName/Test1 XDisplayName_Test1_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am index 0b014266..14ff9483 100644 --- a/xts5/Xlib13/Makefile.am +++ b/xts5/Xlib13/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am index aa9c6f99..9d50b46d 100644 --- a/xts5/Xlib14/Makefile.am +++ b/xts5/Xlib14/Makefile.am @@ -6,11 +6,11 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ - $(top_builddir)/xts5/src/libXR5/libXR5.a \ + $(top_builddir)/xts5/src/libXR5/libXR5.la \ $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am index 076d9570..e9b0ddf3 100644 --- a/xts5/Xlib15/Makefile.am +++ b/xts5/Xlib15/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -17,7 +17,7 @@ nobase_testprog_PROGRAMS = $(tprogs) BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) CLEANFILES = $(BUILT_SOURCES) -XDefaultString_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a +XDefaultString_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la tprogs = \ XAllocClassHint \ @@ -68,9 +68,9 @@ tprogs = \ # Auxiliary programs run from tests CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) nobase_testprog_PROGRAMS += \ diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am index 994299c1..eabe0ad1 100644 --- a/xts5/Xlib16/Makefile.am +++ b/xts5/Xlib16/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -17,10 +17,10 @@ nobase_testprog_PROGRAMS = $(tprogs) BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) CLEANFILES = $(BUILT_SOURCES) -XrmCombineDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a -XrmCombineFileDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a -XrmEnumerateDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a -XrmPermStringToQuark_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a +XrmCombineDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la +XrmCombineFileDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la +XrmEnumerateDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la +XrmPermStringToQuark_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la tprogs = \ XrmCombineDatabase \ diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am index 7c722025..4bd7bf03 100644 --- a/xts5/Xlib17/Makefile.am +++ b/xts5/Xlib17/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -76,9 +76,9 @@ tprogs = \ # Auxiliary programs run from tests CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) nobase_testprog_PROGRAMS += \ diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am index 80f92e1f..a9abce1d 100644 --- a/xts5/Xlib3/Makefile.am +++ b/xts5/Xlib3/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -80,9 +80,9 @@ tprogs = XAllPlanes \ # Auxiliary programs run from tests CHILD_LDADD = $(top_builddir)/src/tet3/tcm/libtcmchild.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) nobase_testprog_PROGRAMS += \ diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am index fdcc5bc1..bbc2f16a 100644 --- a/xts5/Xlib4/Makefile.am +++ b/xts5/Xlib4/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am index b8caa74d..f7daebf4 100644 --- a/xts5/Xlib5/Makefile.am +++ b/xts5/Xlib5/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am index 824844bf..880fca90 100644 --- a/xts5/Xlib6/Makefile.am +++ b/xts5/Xlib6/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am index 630450dd..b22b0c40 100644 --- a/xts5/Xlib7/Makefile.am +++ b/xts5/Xlib7/Makefile.am @@ -6,11 +6,11 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ - $(top_builddir)/xts5/src/libXR5/libXR5.a \ + $(top_builddir)/xts5/src/libXR5/libXR5.la \ $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am index 4439e7a7..9055f999 100644 --- a/xts5/Xlib8/Makefile.am +++ b/xts5/Xlib8/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) @@ -17,7 +17,7 @@ nobase_testprog_PROGRAMS = $(tprogs) BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c) CLEANFILES = $(BUILT_SOURCES) -XFlushGC_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.a +XFlushGC_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la tprogs = \ XChangeGC \ diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am index f33c4401..aafe355f 100644 --- a/xts5/Xlib9/Makefile.am +++ b/xts5/Xlib9/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am index c82cd869..1ef041a0 100644 --- a/xts5/Xopen/Makefile.am +++ b/xts5/Xopen/Makefile.am @@ -6,9 +6,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/xim/libximtest.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/xim/libximtest.la \ + $(top_builddir)/xts5/src/lib/libxtest.la \ + $(top_builddir)/xts5/fonts/libfont.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am index 56557ffa..833332fa 100644 --- a/xts5/Xproto/Makefile.am +++ b/xts5/Xproto/Makefile.am @@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ - $(top_builddir)/xts5/src/libproto/libXst.a \ - $(top_builddir)/xts5/src/lib/libxtest.a \ - $(top_builddir)/xts5/fonts/libfont.a \ + $(top_builddir)/xts5/src/libxts5proto.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(XTS_LIBS) diff --git a/xts5/common.mk b/xts5/common.mk index 61574d92..6bd82550 100644 --- a/xts5/common.mk +++ b/xts5/common.mk @@ -40,7 +40,7 @@ XTESTHOST = `hostname` PVXTESTLIB = ${XTESTLIBDIR}/libxtstpv.a PIXLIB = ${XTESTLIBDIR}/libpvt.a -PVLIBS = ${PVXTESTLIB} $(top_builddir)/xts/fonts/libfont.a ${PIXLIB} \ +PVLIBS = ${PVXTESTLIB} $(top_builddir)/xts/fonts/libfont.la ${PIXLIB} \ $(top_builddir)/src/tet3/apilib/libapi.la # SYSMATHLIB - system math library. Directive to be given to the C compiler diff --git a/xts5/fonts/Makefile.am b/xts5/fonts/Makefile.am index e8b71d7c..df4297e8 100644 --- a/xts5/fonts/Makefile.am +++ b/xts5/fonts/Makefile.am @@ -4,8 +4,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) -noinst_LIBRARIES = libfont.a -libfont_a_SOURCES = xtfont0.c xtfont1.c xtfont2.c xtfont3.c xtfont4.c \ +noinst_LTLIBRARIES = libfont.la +libfont_la_SOURCES = xtfont0.c xtfont1.c xtfont2.c xtfont3.c xtfont4.c \ xtfont5.c xtfont6.c FONTBDFS = xtfont0.bdf xtfont1.bdf xtfont2.bdf xtfont3.bdf xtfont4.bdf \ diff --git a/xts5/src/Makefile.am b/xts5/src/Makefile.am index 890516a5..f1ebeda9 100644 --- a/xts5/src/Makefile.am +++ b/xts5/src/Makefile.am @@ -1,2 +1,18 @@ #SUBDIRS = lib libproto libXR5 libXtaw libXtmu libXtTest pixval xim SUBDIRS = lib libproto libXR5 libXtTest xim bin + +xtslibdir = $(libexecdir)/xts5 +xtslib_LTLIBRARIES = libxts5.la libxts5proto.la + +libxts5_la_SOURCES = +libxts5_la_LDFLAGS = -avoid-version +libxts5_la_LIBADD = \ + lib/libxtest.la \ + ../fonts/libfont.la \ + xim/libximtest.la + +libxts5proto_la_SOURCES = +libxts5proto_la_LDFLAGS = -avoid-version +libxts5proto_la_LIBADD = \ + libproto/libXst.la \ + libxts5.la diff --git a/xts5/src/lib/Makefile.am b/xts5/src/lib/Makefile.am index 9b0dff7d..ce68bd58 100644 --- a/xts5/src/lib/Makefile.am +++ b/xts5/src/lib/Makefile.am @@ -4,8 +4,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) -noinst_LIBRARIES = libxtest.a -libxtest_a_SOURCES = badcmap.c \ +noinst_LTLIBRARIES = libxtest.la +libxtest_la_SOURCES = badcmap.c \ badfont.c\ badgc.c\ badpixm.c\ @@ -41,7 +41,6 @@ libxtest_a_SOURCES = badcmap.c \ gettime.c\ iponlywin.c\ issuppvis.c\ - linkstart.c\ lookupname.c\ makecolmap.c\ makecur.c\ diff --git a/xts5/src/libXR5/Makefile.am b/xts5/src/libXR5/Makefile.am index ff8a3430..4155ef10 100644 --- a/xts5/src/libXR5/Makefile.am +++ b/xts5/src/libXR5/Makefile.am @@ -5,8 +5,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) \ -DDEBUG -noinst_LIBRARIES = libXR5.a -libXR5_a_SOURCES = \ +noinst_LTLIBRARIES = libXR5.la +libXR5_la_SOURCES = \ r5startup.c \ message.c \ dumpbuf.c \ diff --git a/xts5/src/libXtTest/Makefile.am b/xts5/src/libXtTest/Makefile.am index 8f341a17..51884440 100644 --- a/xts5/src/libXtTest/Makefile.am +++ b/xts5/src/libXtTest/Makefile.am @@ -4,8 +4,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ $(XT_CFLAGS) -noinst_LIBRARIES = libXtTest.a -libXtTest_a_SOURCES = avs_def.c \ +noinst_LTLIBRARIES = libXtTest.la +libXtTest_la_SOURCES = avs_def.c \ avs_func.c \ avs_hier.c \ avs_hierd.c \ diff --git a/xts5/src/libXtaw/Makefile.am b/xts5/src/libXtaw/Makefile.am index 74a113de..e46df23f 100644 --- a/xts5/src/libXtaw/Makefile.am +++ b/xts5/src/libXtaw/Makefile.am @@ -1,8 +1,8 @@ include ../../common.mk AM_CFLAGS = $(XTS_CFLAGS) -noinst_LIBRARIES = libXtaw.a -libXtaw_a_SOURCES = AllWidgets.c \ +noinst_LTLIBRARIES = libXtaw.la +libXtaw_la_SOURCES = AllWidgets.c \ Box.c \ Command.c \ Form.c \ diff --git a/xts5/src/libXtmu/Makefile.am b/xts5/src/libXtmu/Makefile.am index f2ebdf59..faa5f575 100644 --- a/xts5/src/libXtmu/Makefile.am +++ b/xts5/src/libXtmu/Makefile.am @@ -1,8 +1,8 @@ include ../../common.mk AM_CFLAGS = $(XTS_CFLAGS) -noinst_LIBRARIES = libXtmu.a -libXtmu_a_SOURCES = Initer.c \ +noinst_LTLIBRARIES = libXtmu.la +libXtmu_la_SOURCES = Initer.c \ StrToShap.c \ StrToJust.c \ ShapeWidg.c \ diff --git a/xts5/src/libproto/Makefile.am b/xts5/src/libproto/Makefile.am index 4fb5474e..40bd91f8 100644 --- a/xts5/src/libproto/Makefile.am +++ b/xts5/src/libproto/Makefile.am @@ -33,8 +33,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) -noinst_LIBRARIES = libXst.a -libXst_a_SOURCES =\ +noinst_LTLIBRARIES = libXst.la +libXst_la_SOURCES =\ XstlibInt.h\ XstosInt.h\ DataMove.h\ @@ -77,5 +77,4 @@ libXst_a_SOURCES =\ Validate.c\ tpstartup.c\ startup.c\ - linkstart.c\ delete.c diff --git a/xts5/src/xim/Makefile.am b/xts5/src/xim/Makefile.am index 2bb4f6fc..ad7214fa 100644 --- a/xts5/src/xim/Makefile.am +++ b/xts5/src/xim/Makefile.am @@ -4,8 +4,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ $(XTS_CFLAGS) -noinst_LIBRARIES = libximtest.a -libximtest_a_SOURCES = \ +noinst_LTLIBRARIES = libximtest.la +libximtest_la_SOURCES = \ linklocale.c \ clnlocale.c \ ic.c \ |