Commit 4efdfdce authored by Youness Alaoui's avatar Youness Alaoui

Move address into the agent's dir

parent de6e8a7e
......@@ -9,7 +9,6 @@
include common.mk
ALWAYS_SUBDIRS = \
address \
stun \
socket \
random \
......
#
# Makefile.am for the Nice Glib ICE library
#
# (C) 2006, 2007 Collabora Ltd.
# (C) 2006, 2007 Nokia Corporation. All rights reserved.
#
# Licensed under MPL 1.1/LGPL 2.1. See file COPYING.
include $(top_srcdir)/common.mk
AM_CFLAGS = $(ERROR_CFLAGS) $(GLIB_CFLAGS)
# library
noinst_LTLIBRARIES = libaddress.la
libaddress_la_SOURCES = \
address.h \
address.c
pkginclude_HEADERS = address.h
# tests
check_PROGRAMS = test
test_LDADD = libaddress.la $(GLIB_LIBS)
TESTS = $(check_PROGRAMS)
......@@ -12,7 +12,6 @@ AM_CFLAGS = \
$(ERROR_CFLAGS) \
$(GLIB_CFLAGS) \
-I $(top_srcdir) \
-I $(top_srcdir)/address \
-I $(top_srcdir)/random \
-I $(top_srcdir)/socket \
-I $(top_srcdir)/stun
......@@ -37,6 +36,8 @@ BUILT_SOURCES = \
CLEANFILES += $(BUILT_SOURCES)
libagent_la_SOURCES = \
address.h \
address.c \
debug.h \
debug.c \
candidate.h \
......@@ -55,18 +56,17 @@ libagent_la_SOURCES = \
$(BUILT_SOURCES)
libagent_la_LIBADD = \
../address/libaddress.la \
../random/librandom.la \
../socket/libsocket.la \
../stun/libstun.la
libagent_la_DEPENDENCIES = \
../address/libaddress.la \
../random/librandom.la \
../socket/libsocket.la \
../stun/libstun.la
check_PROGRAMS = \
test \
test-address \
test-add-remove-stream \
test-priority \
test-mainloop \
......@@ -82,6 +82,8 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
test_LDADD = $(COMMON_LDADD)
test_address_LDADD = $(COMMON_LDADD)
test_add_remove_stream_LDADD = $(COMMON_LDADD)
test_priority_LDADD = $(COMMON_LDADD)
......@@ -96,7 +98,7 @@ test_fallback_LDADD = $(COMMON_LDADD)
test_thread_LDADD = $(COMMON_LDADD)
pkginclude_HEADERS = agent.h candidate.h debug.h
pkginclude_HEADERS = agent.h candidate.h debug.h address.h
all-local:
chmod a+x $(srcdir)/check-test-fullmode-with-stun.sh
......@@ -12,7 +12,6 @@ AM_CFLAGS = -Wall -Werror \
-I $(top_srcdir)/socket \
-I $(top_srcdir)/agent \
-I $(top_srcdir)/random \
-I $(top_srcdir)/address \
-I $(top_srcdir)/stun
COMMON_LDADD = \
......
......@@ -28,7 +28,6 @@ AM_CFLAGS = \
$(ERROR_CFLAGS) \
$(GLIB_CFLAGS) \
-I $(top_srcdir) \
-I $(top_srcdir)/address \
-I $(top_srcdir)/agent \
-I $(top_srcdir)/random \
-I $(top_srcdir)/socket \
......
......@@ -11,12 +11,11 @@ include $(top_srcdir)/common.mk
AM_CFLAGS = \
$(ERROR_CFLAGS) \
$(GLIB_CFLAGS) \
-I $(top_srcdir)/address \
-I $(top_srcdir)/random \
-I $(top_srcdir)/agent \
-I $(top_srcdir)/
COMMON_LDADD = libsocket.la $(GLIB_LIBS) $(top_builddir)/address/libaddress.la $(top_builddir)/stun/libstun.la
COMMON_LDADD = libsocket.la $(top_builddir)/agent/libagent.la $(GLIB_LIBS) $(top_builddir)/stun/libstun.la
noinst_LTLIBRARIES = libsocket.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