tet: Use libtool to combine the libraries where necessary

It turns out that what the original build was doing was building a bunch
of little libapi.a archives and then adding all the members to a big
libapi.a. Libtool handles this for us, so now the big master library is
apilib/libapi.la.

6 files changed, 16 insertions, 14 deletions

diff --git a/src/tet3/Makefile.am b/src/tet3/Makefile.am
index 68f46652..8ad60b41 100644
--- a/src/tet3/Makefile.am
+++ b/src/tet3/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = tcm tcclib apilib dtet2lib tcclib tcc 
+SUBDIRS = tcm dtet2lib apilib tcclib tcc
 
diff --git a/src/tet3/apilib/Makefile.am b/src/tet3/apilib/Makefile.am
index 7623ab11..1eeca7b0 100644
--- a/src/tet3/apilib/Makefile.am
+++ b/src/tet3/apilib/Makefile.am
@@ -1,6 +1,9 @@
 AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include -DTET_LITE
-noinst_LIBRARIES = libapi.a
-libapi_a_SOURCES = \
+noinst_LTLIBRARIES = libapi.la
+# If we weren't building TeT lite, this could also add inetlib, servlib
+# and xtilib
+libapi_la_LIBADD = ../tcm/libtcm.la ../dtet2lib/libdtet2.la
+libapi_la_SOURCES = \
 		dconfig.c \
 		dresfile.c \
 		errno.c \
diff --git a/src/tet3/dtet2lib/Makefile.am b/src/tet3/dtet2lib/Makefile.am
index c008365b..1cc8aa78 100644
--- a/src/tet3/dtet2lib/Makefile.am
+++ b/src/tet3/dtet2lib/Makefile.am
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include
-noinst_LIBRARIES = libapi.a
-libapi_a_SOURCES = \
+AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include -DTET_LITE
+noinst_LTLIBRARIES = libdtet2.la
+libdtet2_la_SOURCES = \
 		addarg.c \
 		alarm.c \
 		amsg.c \
@@ -77,5 +77,4 @@ libapi_a_SOURCES = \
 		valmsg.c \
 		w32err.c \
 		wait3.c \
-		wsaerr.c 
-
+		wsaerr.c
diff --git a/src/tet3/tcc/Makefile.am b/src/tet3/tcc/Makefile.am
index 542ebb39..edfb8b17 100644
--- a/src/tet3/tcc/Makefile.am
+++ b/src/tet3/tcc/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include -DTET_LITE
 noinst_PROGRAMS = tcc
-# Note: the order of these is important
-tcc_LDADD = ../tcm/libapi.a ../apilib/libapi.a ../tcclib/libapi.a ../dtet2lib/libapi.a
+tcc_LDADD = ../tcclib/libtcc.la
 tcc_SOURCES = cleanup.c \
 		config.c \
 		copysave.c \
diff --git a/src/tet3/tcclib/Makefile.am b/src/tet3/tcclib/Makefile.am
index cf2a8695..30d80c96 100644
--- a/src/tet3/tcclib/Makefile.am
+++ b/src/tet3/tcclib/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include -DTET_LITE
-noinst_LIBRARIES = libapi.a
-libapi_a_SOURCES = \
+noinst_LTLIBRARIES = libtcc.la
+libtcc_la_LIBADD = ../apilib/libapi.la
+libtcc_la_SOURCES = \
 		lockfile.c \
 		lsdir.c \
 		mktmpdir.c \
diff --git a/src/tet3/tcm/Makefile.am b/src/tet3/tcm/Makefile.am
index 12f064a7..dc939b1d 100644
--- a/src/tet3/tcm/Makefile.am
+++ b/src/tet3/tcm/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I../inc -I$(top_srcdir)/include -DTET_LITE
-noinst_LIBRARIES = libapi.a
-libapi_a_SOURCES = child.c \
+noinst_LTLIBRARIES = libtcm.la
+libtcm_la_SOURCES = child.c \
 			ckversion.c \
 			dynlink.c \
 			ictp.c \