Commit de84216f authored by Pekka Pessi's avatar Pekka Pessi

Fixed shared library build. (kv)

Build all submodules as proper shared libraries (noinst_LTLIBRARIES).
Fixes sf.net:#1264030.

darcs-hash:20051013144541-65a35-e3fda8d1a8df3757a68a1f9019383a1c51ea1329.gz
parent 3337c306
2005-10-13 Kai Vehmanen <kai.vehmanen@nokia.com>
* <SUBDIRS>/Makefile.am: Build all submodules as proper shared
libraries (noinst_LTLIBRARIES). Fixes sf.net:#1264030.
2005-09-09 Pekka Pessi <Pekka.Pessi@nokia.com>
* darcs changes --from-tag pessi-darcs-1:
......
......@@ -12,26 +12,26 @@ EXTRA_DIST = sofia.am
lib_LTLIBRARIES = libsofia-sip-ua.la
if HAVE_TLS
tls_objs=stun/stun_objs.o
tls_objs=stun/libstun.la
endif
libsofia_sip_ua_la_SOURCES =
libsofia_sip_ua_la_LIBADD = bnf/bnf_objs.o \
ipt/ipt_objs.o \
iptsec/iptsec_objs.o \
msg/msg_objs.o \
nea/nea_objs.o \
nta/nta_objs.o \
nth/nth_objs.o \
nua/nua_objs.o \
http/http_objs.o \
sdp/sdp_objs.o \
sip/sip_objs.o \
soa/soa_objs.o \
sresolv/sresolv_objs.o \
su/su_objs.o \
tport/tport_objs.o \
url/url_objs.o \
libsofia_sip_ua_la_LIBADD = bnf/libbnf.la \
ipt/libipt.la \
iptsec/libiptsec.la \
msg/libmsg.la \
nea/libnea.la \
nta/libnta.la \
nth/libnth.la \
nua/libnua.la \
http/libhttp.la \
sdp/libsdp.la \
sip/libsip.la \
soa/libsoa.la \
sresolv/libsresolv.la \
su/libsu.la \
tport/libtport.la \
url/liburl.la \
${tls_objs}
if ENABLE_COVERAGE
......
......@@ -10,8 +10,7 @@ INCLUDES = -I$(srcdir)/../su
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libbnf.a
noinst_PROGRAMS = bnf_objs.o
noinst_LTLIBRARIES = libbnf.la
check_PROGRAMS = torture_bnf
......@@ -20,13 +19,11 @@ check_PROGRAMS = torture_bnf
include_HEADERS = bnf.h
libbnf_a_SOURCES = bnf.c
bnf_objs_o_SOURCES = $(libbnf_a_SOURCES)
bnf_objs_o_LDADD =
libbnf_la_SOURCES = bnf.c
COVERAGE_INPUT = $(bnf_objs_o_SOURCES) $(include_HEADERS)
LDADD = libbnf.a
LDADD = libbnf.la
torture_bnf_SOURCES = torture_bnf.c
......
......@@ -13,9 +13,9 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libhttp.a
noinst_LTLIBRARIES = libhttp.la
bin_PROGRAMS =
noinst_PROGRAMS = http_test http_objs.o
noinst_PROGRAMS = http_test
TESTS = http_test
......@@ -32,22 +32,19 @@ BUILT_SOURCES = $(BUILT_H) $(BUILT_C)
include_HEADERS = $(BUILT_H) $(PUBLIC_H)
libhttp_a_SOURCES = $(INTERNAL_H) \
libhttp_la_SOURCES = $(INTERNAL_H) \
http_parser.c http_header.c \
http_basic.c http_extra.c \
http_status.c http_tag_class.c \
$(BUILT_C)
http_objs_o_SOURCES = $(libhttp_a_SOURCES)
http_objs_o_LDADD =
COVERAGE_INPUT = $(http_objs_o_SOURCES) $(include_HEADERS)
LDADD = libhttp.a \
-L../bnf -lbnf \
-L../msg -lmsg \
-L../url -lurl \
-L../su -lsu
LDADD = libhttp.la \
../bnf/libbnf.la \
../msg/libmsg.la \
../url/liburl.la \
../su/libsu.la
http_test_SOURCES = http_test.c
......
......@@ -10,9 +10,9 @@ INCLUDES = -I$(srcdir)/../su
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libipt.a
noinst_LTLIBRARIES = libipt.la
noinst_PROGRAMS = sha1test torture_base64 ipt_objs.o
noinst_PROGRAMS = sha1test torture_base64
TESTS = sha1test torture_base64
......@@ -22,18 +22,15 @@ TESTS = sha1test torture_base64
include_HEADERS = rc4.h utf8.h sha1.h base64.h \
string0.h token64.h uniqueid.h
libipt_a_SOURCES = utf8internal.h \
libipt_la_SOURCES = utf8internal.h \
utf8.c ucs2.c ucs4.c rc4.c \
sha1.c base64.c string0.c token64.c
ipt_objs_o_SOURCES = $(libipt_a_SOURCES)
ipt_objs_o_LDADD =
COVERAGE_INPUT = $(ipt_objs_o_SOURCES) $(include_HEADERS)
LDADD = libipt.a
-L../sresolv -lsresolv \
-L../su -lsu
LDADD = libipt.la \
../sresolv/libsresolv.la \
../su/libsu.la
sha1test_SOURCES = sha1test.c
......
......@@ -17,9 +17,9 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libiptsec.a
noinst_LTLIBRARIES = libiptsec.la
noinst_PROGRAMS = auth_digest_test iptsec_objs.o
noinst_PROGRAMS = auth_digest_test
TESTS = auth_digest_test
......@@ -31,7 +31,7 @@ BUILT_SOURCES = auth_tag_ref.c
include_HEADERS = auth_client.h auth_digest.h auth_dll.h \
auth_module.h auth_plugin.h
libiptsec_a_SOURCES = iptsec_debug.h \
libiptsec_la_SOURCES = iptsec_debug.h \
auth_client.c auth_digest.c \
auth_module.c auth_tag.c auth_tag_ref.c \
auth_plugin.c auth_plugin_delayed.c \
......@@ -41,20 +41,17 @@ libiptsec_a_SOURCES = iptsec_debug.h \
SIPSOURCES = auth_module_sip.c
HTTPSOURCES = auth_module_http.c
iptsec_objs_o_SOURCES = $(libiptsec_a_SOURCES)
iptsec_objs_o_LDADD =
COVERAGE_INPUT = $(iptsec_objs_o_SOURCES) $(include_HEADERS)
LDADD = libiptsec.a \
-L../ipt -lipt \
-L../http -lhttp \
-L../msg -lmsg \
-L../nta -lnta \
-L../sip -lsip \
-L../url -lurl \
-L../bnf -lbnf \
-L../su -lsu
LDADD = libiptsec.la \
../ipt/libipt.la \
../http/libhttp.la \
../msg/libmsg.la \
../nta/libnta.la \
../sip/libsip.la \
../url/liburl.la \
../bnf/libbnf.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -12,8 +12,9 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libmsg.a libmsg_test.a
noinst_PROGRAMS = msg_name_hash msg_test msg_objs.o
noinst_LTLIBRARIES = libmsg.la
noinst_LIBRARIES = libmsg_test.a
noinst_PROGRAMS = msg_name_hash msg_test
# ----------------------------------------------------------------------
# Rules for building the targets
......@@ -29,7 +30,7 @@ include_HEADERS = $(GENERATED_H) $(PUBLIC_H)
BUILT_SOURCES = $(GENERATED_H) msg_test_table.c msg_test_protos.h
libmsg_a_SOURCES = $(INTERNAL_H) \
libmsg_la_SOURCES = $(INTERNAL_H) \
msg.c msg_tag.c \
msg_mime.c msg_mime_table.c \
msg_header_copy.c msg_header_make.c \
......@@ -37,17 +38,14 @@ libmsg_a_SOURCES = $(INTERNAL_H) \
msg_basic.c msg_generic.c msg_date.c msg_auth.c \
memspn.c
msg_objs_o_SOURCES = $(libmsg_a_SOURCES)
msg_objs_o_LDADD =
COVERAGE_INPUT = $(msg_objs_o_SOURCES) $(include_HEADERS)
libmsg_test_a_SOURCES = msg_test_class.c msg_test_table.c msg_test_protos.h
LDADD = libmsg_test.a libmsg.a \
-L../bnf -lbnf \
-L../url -lurl \
-L../su -lsu
LDADD = libmsg_test.a libmsg.la \
../bnf/libbnf.la \
../url/liburl.la \
../su/libsu.la
msg_test_SOURCES = msg_test.c
......
......@@ -17,9 +17,7 @@ INCLUDES = -I$(srcdir)/../ipt \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libnea.a
noinst_PROGRAMS = nea_objs.o
noinst_LTLIBRARIES = libnea.la
TESTS =
......@@ -30,25 +28,22 @@ BUILT_SOURCES = nea_tag_ref.c
include_HEADERS = nea.h nea_dll.h nea_debug.h
libnea_a_SOURCES = nea.c nea_event.c \
libnea_la_SOURCES = nea.c nea_event.c \
nea_server.c nea_debug.c nea_tag.c nea_tag_ref.c
nea_objs_o_SOURCES = $(libnea_a_SOURCES)
nea_objs_o_LDADD =
COVERAGE_INPUT = $(nea_objs_o_SOURCES) $(include_HEADERS)
LDADD = libnea.a \
-L../nta -lnta \
-L../ipt -lipt \
-L../sip -lsip \
-L../sresolv -lsresolv \
-L../tport -ltport \
-L../stun -lstun \
-L../url -lurl \
-L../msg -lmsg \
-L../bnf -lbnf \
-L../su -lsu
LDADD = libnea.la \
../nta/libnta.la \
../ipt/libipt.la \
../sip/libsip.la \
../sresolv/libsresolv.la \
../tport/libtport.la \
../stun/libstun.la \
../url/liburl.la \
../msg/libmsg.la \
../bnf/libbnf.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -16,9 +16,9 @@ INCLUDES = -I$(srcdir)/../ipt \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libnta.a
noinst_LTLIBRARIES = libnta.la
noinst_PROGRAMS = nta_test portbind nta_objs.o
noinst_PROGRAMS = nta_test portbind
dist_noinst_SCRIPTS = run_nta_test
TESTS = run_nta_test
......@@ -32,26 +32,23 @@ BUILT_SOURCES = nta_tag_ref.c
include_HEADERS = nta.h nta_stateless.h nta_tport.h \
nta_tag.h nta_dll.h sl_utils.h
libnta_a_SOURCES = nta.c nta_tag.c nta_tag_ref.c \
libnta_la_SOURCES = nta.c nta_tag.c nta_tag_ref.c \
nta_internal.h \
sl_utils.c sl_utils_print.c sl_utils_log.c \
sl_read_payload.c
nta_objs_o_SOURCES = $(libnta_a_SOURCES)
nta_objs_o_LDADD =
COVERAGE_INPUT = $(nta_objs_o_SOURCES) $(include_HEADERS)
LDADD = libnta.a \
-L../ipt -lipt \
-L../sip -lsip \
-L../sresolv -lsresolv \
-L../tport -ltport \
-L../stun -lstun \
-L../url -lurl \
-L../msg -lmsg \
-L../bnf -lbnf \
-L../su -lsu
LDADD = libnta.la \
../ipt/libipt.la \
../sip/libsip.la \
../sresolv/libsresolv.la \
../tport/libtport.la \
../stun/libstun.la \
../url/liburl.la \
../msg/libmsg.la \
../bnf/libbnf.la \
../su/libsu.la
nta_test_SOURCES = nta_test.c
......
......@@ -17,9 +17,9 @@ INCLUDES = -I$(srcdir)/../ipt \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libnth.a
noinst_LTLIBRARIES = libnth.la
noinst_PROGRAMS = nth_test http-client http-server nth_objs.o
noinst_PROGRAMS = nth_test http-client http-server
TESTS = nth_test
......@@ -30,26 +30,21 @@ BUILT_SOURCES = nth_tag_ref.c
include_HEADERS = nth.h nth_tag.h
libnth_a_SOURCES = nth_client.c nth_server.c nth_tag.c nth_tag_ref.c
nth_objs_o_SOURCES = $(libnth_a_SOURCES)
nth_objs_o_LDADD =
nth_objs_o_LDFLAGS =
libnth_la_SOURCES = nth_client.c nth_server.c nth_tag.c nth_tag_ref.c
COVERAGE_INPUT = $(nth_objs_o_SOURCES) $(include_HEADERS)
LDADD = libnth.a \
-L../iptsec -liptsec \
-L../ipt -lipt \
-L../http -lhttp \
-L../sresolv -lsresolv \
-L../tport -ltport \
-L../stun -lstun \
-L../url -lurl \
-L../msg -lmsg \
-L../bnf -lbnf \
-L../su -lsu
LDADD = libnth.la \
../iptsec/libiptsec.la \
../ipt/libipt.la \
../http/libhttp.la \
../sresolv/libsresolv.la \
../tport/libtport.la \
../stun/libstun.la \
../url/liburl.la \
../msg/libmsg.la \
../bnf/libbnf.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -23,11 +23,9 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libnua.a
noinst_LTLIBRARIES = libnua.la
noinst_PROGRAMS = nua_objs.o
noinst_PROGRAMS += test_nua
noinst_PROGRAMS = test_nua
TESTS = test_nua
......@@ -38,7 +36,7 @@ BUILT_SOURCES = nua_tag_ref.c
include_HEADERS = nua.h nua_stack.h nua_tag.h
libnua_a_SOURCES = nua.c nua_common.c nua_stack.c \
libnua_la_SOURCES = nua.c nua_common.c nua_stack.c \
nua_tag.c nua_tag_ref.c
nua_objs_o_SOURCES = $(libnua_a_SOURCES)
......@@ -46,22 +44,22 @@ nua_objs_o_LDADD =
COVERAGE_INPUT = $(nua_objs_o_SOURCES) $(include_HEADERS)
LDADD = libnua.a \
../iptsec/libiptsec.a \
../ipt/libipt.a \
../http/libhttp.a \
../nea/libnea.a \
../nta/libnta.a \
../sresolv/libsresolv.a \
../tport/libtport.a \
../stun/libstun.a \
../soa/libsoa.a \
../sdp/libsdp.a \
../sip/libsip.a \
../msg/libmsg.a \
../url/liburl.a \
../bnf/libbnf.a \
../su/libsu.a
LDADD = libnua.la \
../iptsec/libiptsec.la \
../ipt/libipt.la \
../http/libhttp.la \
../nea/libnea.la \
../nta/libnta.la \
../sresolv/libsresolv.la \
../tport/libtport.la \
../stun/libstun.la \
../soa/libsoa.la \
../sdp/libsdp.la \
../sip/libsip.la \
../msg/libmsg.la \
../url/liburl.la \
../bnf/libbnf.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -10,9 +10,9 @@ INCLUDES = -I$(srcdir)/../su
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libsdp.a
noinst_LTLIBRARIES = libsdp.la
noinst_PROGRAMS = sdp_torture sdp_test sdp_objs.o
noinst_PROGRAMS = sdp_torture sdp_test
dist_noinst_SCRIPTS = run-tests
......@@ -25,16 +25,13 @@ BUILT_SOURCES = sdp_tag_ref.c
include_HEADERS = sdp.h sdp_tag.h
libsdp_a_SOURCES = sdp.c sdp_parse.c sdp_print.c \
libsdp_la_SOURCES = sdp.c sdp_parse.c sdp_print.c \
sdp_tag.c sdp_tag_ref.c
sdp_objs_o_SOURCES = $(libsdp_a_SOURCES)
sdp_objs_o_LDADD =
COVERAGE_INPUT = $(sdp_objs_o_SOURCES) $(include_HEADERS)
LDADD = libsdp.a \
-L../su -lsu
LDADD = libsdp.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -14,11 +14,10 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libsip.a
noinst_LTLIBRARIES = libsip.la
noinst_PROGRAMS = torture_sip \
sip_test_msg validator date_test \
sip_objs.o
sip_test_msg validator date_test
# ----------------------------------------------------------------------
# Rules for building the targets
......@@ -39,7 +38,7 @@ BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C)
include_HEADERS = $(GENERATED_H) $(PUBLIC_H) $(H_IN)
libsip_a_SOURCES = $(INTERNAL_H) \
libsip_la_SOURCES = $(INTERNAL_H) \
sip_parser.c sip_header.c sip_util.c sip_pref_util.c \
sip_basic.c sip_extra.c sip_feature.c sip_mime.c \
sip_security.c sip_event.c sip_prack.c \
......@@ -49,16 +48,13 @@ libsip_a_SOURCES = $(INTERNAL_H) \
sip_tag_class.c \
$(GENERATED_C)
sip_objs_o_SOURCES = $(libsip_a_SOURCES)
sip_objs_o_LDADD =
COVERAGE_INPUT = $(sip_objs_o_SOURCES) $(include_HEADERS)
LDADD = libsip.a \
-L../msg -lmsg \
-L../bnf -lbnf \
-L../url -lurl \
-L../su -lsu
LDADD = libsip.la \
../msg/libmsg.la \
../bnf/libbnf.la \
../url/liburl.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -29,7 +29,7 @@
* @author Pekka Pessi <Pekka.Pessi@nokia.com>.
*
* @date Created: Tue Jun 13 02:57:51 2000 ppessi
* @date Last modified: Wed Oct 12 18:32:48 2005 ppessi
* @date Last modified: Thu Oct 13 14:37:28 2005 kaiv
*/
#include "config.h"
......@@ -245,7 +245,7 @@ int sip_header_field_d(su_home_t *home, sip_header_t *h, char *s, int slen)
}
/** Encode a SIP header contents. */
int sip_header_field_e(char b[], int bsiz, sip_header_t const *h, int flags)
int sip_header_field_e(char *b, int bsiz, sip_header_t const *h, int flags)
{
assert(h); assert(h->sh_class);
......
......@@ -13,9 +13,9 @@ INCLUDES = -I$(srcdir)/../sdp \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libsoa.a
noinst_LTLIBRARIES = libsoa.la
noinst_PROGRAMS = soa_objs.o test_soa
noinst_PROGRAMS = test_soa
TESTS = test_soa
......@@ -26,7 +26,7 @@ BUILT_SOURCES = soa_tag_ref.c
include_HEADERS = soa.h soa_session.h soa_add.h soa_tag.h
libsoa_a_SOURCES = soa.c soa_static.c \
libsoa_la_SOURCES = soa.c soa_static.c \
soa_tag.c soa_tag_ref.c
soa_objs_o_SOURCES = $(libsoa_a_SOURCES)
......@@ -34,11 +34,11 @@ soa_objs_o_LDADD =
COVERAGE_INPUT = $(soa_objs_o_SOURCES) $(include_HEADERS)
LDADD = libsoa.a \
-L../sip -lsip \
-L../sdp -lsdp \
-L../ipt -lipt \
-L../su -lsu
LDADD = libsoa.la \
../sip/libsip.la \
../sdp/libsdp.la \
../ipt/libipt.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Install and distribution rules
......
......@@ -10,9 +10,9 @@ INCLUDES = -I$(srcdir)/../su
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libsresolv.a
noinst_LTLIBRARIES = libsresolv.la
noinst_PROGRAMS = test_sresolv sresolv_objs.o
noinst_PROGRAMS = test_sresolv
TESTS = torture_sresolv
......@@ -27,17 +27,14 @@ CLEANFILES = resolv.conf error.conf named.conf.tmp \
include_HEADERS = sresolv.h
libsresolv_a_SOURCES = sresolv.c
libsresolv_la_SOURCES = sresolv.c
test_sresolv_SOURCES = test_sresolv.c
sresolv_objs_o_SOURCES= $(libsresolv_a_SOURCES)
sresolv_objs_o_LDADD =
COVERAGE_INPUT = $(sresolv_objs_o_SOURCES) $(include_HEADERS)
LDADD = libsresolv.a \
-L../su -lsu
LDADD = libsresolv.la \
../su/libsu.la
# ----------------------------------------------------------------------
# Distribution
......
......@@ -16,14 +16,14 @@ INCLUDES = -I$(srcdir)/../su
# Build targets
if HAVE_TLS
stun_lib_targets = libstun.a
stun_prog_targets = stun_objs.o stunc torture_stun
stun_lib_targets = libstun.la
stun_prog_targets = stunc torture_stun
else
stun_lib_targets =
stun_prog_targets =
endif
noinst_LIBRARIES = ${stun_lib_targets}
noinst_LTLIBRARIES = ${stun_lib_targets}
noinst_PROGRAMS = ${stun_prog_targets}
# ----------------------------------------------------------------------
......@@ -31,21 +31,18 @@ noinst_PROGRAMS = ${stun_prog_targets}
include_HEADERS = stun.h stun_common.h
libstun_a_SOURCES = stun.c stun_common.c
stun_objs_o_SOURCES = $(libstun_a_SOURCES)
stun_objs_o_LDADD =
libstun_la_SOURCES = stun.c stun_common.c
COVERAGE_INPUT = $(stun_objs_o_SOURCES) $(include_HEADERS)
# common LDFLAGS to all utils
LDADD = libstun.a \
-L../su -lsu
LDADD = libstun.la \
../su/libsu.la
stunc_DEPENDENCIES = $(LIBDEP) libstun.a
stunc_DEPENDENCIES = $(LIBDEP) libstun.la
stunc_SOURCES = stunc.c
torture_stun_DEPENDENCIES = $(LIBDEP) libstun.a
torture_stun_DEPENDENCIES = $(LIBDEP) libstun.la
torture_stun_SOURCES = torture_stun.c
# ----------------------------------------------------------------------
......
......@@ -10,7 +10,7 @@ INCLUDES = $(GLIB_CFLAGS)
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libsu.a
noinst_LTLIBRARIES = libsu.la
bin_PROGRAMS = addrinfo localinfo
......@@ -19,9 +19,7 @@ noinst_PROGRAMS = su_torture torture_su_port \
htable_test torture_rbtree \
test_memmem torture_su_memmem \
su_root_test su_timer_test \
su_test su_proxy poll_test \
su_objs.o
su_test su_proxy poll_test
# ----------------------------------------------------------------------
# Tests
......@@ -54,7 +52,7 @@ include_HEADERS = su_types.h su.h su_localinfo.h \
su_config.h su_configure.h su_md5.h su_uniqueid.h \
tstdef.h rbtree.h su_memmem.h
libsu_a_SOURCES = \
libsu_la_SOURCES = \
su.c $(GSOURCES) \
su_alloc.c su_alloc_lock.c su_strdup.c su_sprintf.c \
su_strlst.c su_vector.c \
......@@ -65,12 +63,9 @@ libsu_a_SOURCES = \
su_log.c su_global_log.c su_default_log.c \
su_md5.c su_uniqueid.c su_memmem.c
su_objs_o_SOURCES = $(libsu_a_SOURCES)
su_objs_o_LDADD =
COVERAGE_INPUT = $(su_objs_o_SOURCES) $(include_HEADERS)
LDADD = libsu.a $(GLIB_LIBS)
LDADD = libsu.la $(GLIB_LIBS)
if NDEBUG
AM_CFLAGS = -DNDEBUG
......
......@@ -15,11 +15,11 @@ INCLUDES = -I$(srcdir)/../bnf \
# ----------------------------------------------------------------------
# Build targets
noinst_LIBRARIES = libtport.a
noinst_LTLIBRARIES = libtport.la
bin_PROGRAMS =
noinst_PROGRAMS = tport_test tport_objs.o
noinst_PROGRAMS = tport_test
TESTS = tport_test
......@@ -32,25 +32,22 @@ if HAVE_TLS
TLS_SRC = tport_tls.c tport_tls.h
endif
libtport_a_SOURCES = tport.c tport_tag.c tport_tag_ref.c $(TLS_SRC)
libtport_la_SOURCES = tport.c tport_tag.c tport_tag_ref.c $(TLS_SRC)
# to make sure all files end up in the dist package
EXTRA_DIST = $(libtport_a_SOURCES) tport_tls.c tport_tls.h tport_test.c
BUILT_SOURCES = tport_tag_ref.c
tport_objs_o_SOURCES = $(libtport_a_SOURCES)
tport_objs_o_LDADD =
COVERAGE_INPUT = $(tport_objs_o_SOURCES) $(include_HEADERS)
LDADD = libtport.a \
-L../stun -lstun \
-L../ipt -lipt \
-L../msg -lmsg_test -lmsg \
-L../url -lurl \
-L../bnf -lbnf \
-L../su -lsu
LDADD = libtport.la \
../stun/libstun.la \
../ipt/libipt.la \
../msg/libmsg_test.a ../msg/libmsg.la \
../url/liburl.la \
../bnf/libbnf.la \
../su/libsu.la