Commit b0478278 authored by Pekka Pessi's avatar Pekka Pessi
Browse files

Updated libsofia-sip-ua-glib dist targets.

darcs-hash:20060313195330-65a35-1d4823d7d949ef00feaef0ee5e73df1ed5d7b02a.gz
parent fb698a60
...@@ -25,14 +25,16 @@ GOBJECT_TARGETS= ...@@ -25,14 +25,16 @@ GOBJECT_TARGETS=
endif endif
# note: order does matter in the subdir list # note: order does matter in the subdir list
SUBDIRS = $(GLIB_SUBDIRS) SUBDIRS = $(GLIB_SUBDIRS) $(GOBJECT_SUBDIRS)
DIST_SUBDIRS=su-glib nua-glib
DOXYGEN = doxygen DOXYGEN = doxygen
lib_LTLIBRARIES = libsofia-sip-ua-glib.la lib_LTLIBRARIES = libsofia-sip-ua-glib.la
libsofia_sip_ua_glib_la_SOURCES = libsofia_sip_ua_glib_la_SOURCES =
libsofia_sip_ua_glib_la_LIBADD = $(GLIB_TARGETS) libsofia_sip_ua_glib_la_LIBADD = $(GLIB_TARGETS) $(GOBJECT_TARGETS)
built-sources-recursive clean-built-sources-recursive: built-sources-recursive clean-built-sources-recursive:
target=`echo $@ | sed s/-recursive//`; \ target=`echo $@ | sed s/-recursive//`; \
......
...@@ -6,33 +6,31 @@ ...@@ -6,33 +6,31 @@
# Licensed under LGPL. See file COPYING. # Licensed under LGPL. See file COPYING.
# #
if HAVE_GLIB
GLIB_BUILT = nua_glib_marshal.c \ GLIB_BUILT = nua_glib_marshal.c \
nua_glib_marshal.h nua_glib_marshal.h
else
GLIB_BUILT =
endif
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Header paths # Header paths
S_BASE=../../libsofia-sip-ua S_BASE = $(top_srcdir)/libsofia-sip-ua
B_BASE = $(top_builddir)/libsofia-sip-ua
INCLUDES = -I$(srcdir)/$(S_BASE)/bnf -I$(S_BASE)/bnf \
-I$(srcdir)/$(S_BASE)/ipt -I$(S_BASE)/ipt \ INCLUDES = -I$(S_BASE)/bnf -I$(B_BASE)/bnf \
-I$(srcdir)/$(S_BASE)/iptsec -I$(S_BASE)/iptsec \ -I$(S_BASE)/ipt -I$(B_BASE)/ipt \
-I$(srcdir)/$(S_BASE)/http -I$(S_BASE)/http \ -I$(S_BASE)/iptsec -I$(B_BASE)/iptsec \
-I$(srcdir)/$(S_BASE)/msg -I$(S_BASE)/msg \ -I$(S_BASE)/http -I$(B_BASE)/http \
-I$(srcdir)/$(S_BASE)/nea -I$(S_BASE)/nea \ -I$(S_BASE)/msg -I$(B_BASE)/msg \
-I$(srcdir)/$(S_BASE)/nta -I$(S_BASE)/nta \ -I$(S_BASE)/nea -I$(B_BASE)/nea \
-I$(srcdir)/$(S_BASE)/nth -I$(S_BASE)/nth \ -I$(S_BASE)/nta -I$(B_BASE)/nta \
-I$(srcdir)/$(S_BASE)/nua -I$(S_BASE)/nua \ -I$(S_BASE)/nth -I$(B_BASE)/nth \
-I$(srcdir)/$(S_BASE)/sdp -I$(S_BASE)/sdp \ -I$(S_BASE)/nua -I$(B_BASE)/nua \
-I$(srcdir)/$(S_BASE)/sip -I$(S_BASE)/sip \ -I$(S_BASE)/sdp -I$(B_BASE)/sdp \
-I$(srcdir)/$(S_BASE)/soa -I$(S_BASE)/soa \ -I$(S_BASE)/sip -I$(B_BASE)/sip \
-I$(srcdir)/$(S_BASE)/tport -I$(S_BASE)/tport \ -I$(S_BASE)/soa -I$(B_BASE)/soa \
-I$(srcdir)/$(S_BASE)/url -I$(S_BASE)/url \ -I$(S_BASE)/tport -I$(B_BASE)/tport \
-I$(srcdir)/$(S_BASE)/su -I$(S_BASE)/su \ -I$(S_BASE)/url -I$(B_BASE)/url \
-I$(S_BASE)/su -I$(B_BASE)/su \
-I$(srcdir)/../su-glib/ \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -49,18 +47,18 @@ nobase_include_sofia_HEADERS = \ ...@@ -49,18 +47,18 @@ nobase_include_sofia_HEADERS = \
sofia-sip/nua_glib.h sofia-sip/nua_glib.h
noinst_HEADERS = nua_glib_priv.h noinst_HEADERS = nua_glib_priv.h
noinst_PROGRAMS = test_nua_glib noinst_PROGRAMS = test_nua_glib
libnua_glib_la_SOURCES = \ libnua_glib_la_SOURCES = nua_glib.c
nua_glib.c \
$(GLIB_BUILT) libnua_glib_la_LIBADD = nua_glib_marshal.lo
LDADD = $(GLIB_LIBS) -lgobject-2.0 \ LDADD = $(GLIB_LIBS) -lgobject-2.0 \
libnua-glib.la \ libnua-glib.la ../su-glib/libsu-glib.la \
../../libsofia-sip-ua/libsofia-sip-ua.la ../../libsofia-sip-ua/libsofia-sip-ua.la
test_nua_glib_LDFLAGS = -static test_nua_glib_LDFLAGS = -static
test_nua_glib_SOURCES = test_nua_glib.c
if HAVE_GLIB if HAVE_GLIB
%_marshal.h: %_marshal.list Makefile %_marshal.h: %_marshal.list Makefile
...@@ -78,3 +76,4 @@ EXTRA_DIST = Doxyfile nua_glib.docs $(BUILT_SOURCES) ...@@ -78,3 +76,4 @@ EXTRA_DIST = Doxyfile nua_glib.docs $(BUILT_SOURCES)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Sofia specific rules # Sofia specific rules
include ../../libsofia-sip-ua/sofia.am
...@@ -9,8 +9,10 @@ ...@@ -9,8 +9,10 @@
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Headers # Headers
S_BASE=../../libsofia-sip-ua S_BASE = $(top_srcdir)/libsofia-sip-ua
INCLUDES = -I$(srcdir)/$(S_BASE)/su -I$(S_BASE)/su \ B_BASE = $(top_builddir)/libsofia-sip-ua
INCLUDES = -I$(S_BASE)/su -I$(B_BASE)/su \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -55,3 +57,5 @@ AUTOMAKE_OPTIONS = foreign ...@@ -55,3 +57,5 @@ AUTOMAKE_OPTIONS = foreign
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Sofia specific rules # Sofia specific rules
include ../../libsofia-sip-ua/sofia.am
...@@ -17,7 +17,7 @@ TAG_AWK=$(top_srcdir)/libsofia-sip-ua/su/tag_dll.awk ...@@ -17,7 +17,7 @@ TAG_AWK=$(top_srcdir)/libsofia-sip-ua/su/tag_dll.awk
if ENABLE_COVERAGE if ENABLE_COVERAGE
coverage: coverage:
@$(srcdir)/../../scripts/coverage $(COVERAGE_FLAGS) $(COVERAGE_INPUT) @$(top_srcdir)/scripts/coverage $(COVERAGE_FLAGS) $(COVERAGE_INPUT)
endif endif
../bnf/libbnf.la ../http/libhttp.la ../ipt/libipt.la ../iptsec/libiptsec.la \ ../bnf/libbnf.la ../http/libhttp.la ../ipt/libipt.la ../iptsec/libiptsec.la \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment