Commit 520d2973 authored by Youness Alaoui's avatar Youness Alaoui

Update makefiles and configure to the new changes in file structure for the NiceSocket

parent 4b833fd9
......@@ -13,7 +13,7 @@ ALWAYS_SUBDIRS = \
local \
stun \
tests \
udp \
socket \
random \
agent \
nice
......
......@@ -14,7 +14,7 @@ AM_CFLAGS = \
-I $(top_srcdir) \
-I $(top_srcdir)/address \
-I $(top_srcdir)/random \
-I $(top_srcdir)/udp \
-I $(top_srcdir)/socket \
-I $(top_srcdir)/stun
COMMON_LDADD = libagent.la $(GLIB_LIBS)
......@@ -57,12 +57,12 @@ libagent_la_SOURCES = \
libagent_la_LIBADD = \
../address/libaddress.la \
../random/librandom.la \
../udp/libudp.la \
../socket/libsocket.la \
../stun/libstun.la
libagent_la_DEPENDENCIES = \
../address/libaddress.la \
../random/librandom.la \
../udp/libudp.la \
../socket/libsocket.la \
../stun/libstun.la
check_PROGRAMS = \
......
......@@ -13,7 +13,7 @@ AC_CONFIG_FILES([
stun/tests/Makefile
stun/tools/Makefile
local/Makefile
udp/Makefile
socket/Makefile
nice/Makefile
nice/nice.pc
random/Makefile
......
......@@ -9,7 +9,7 @@
AM_CFLAGS = -Wall -Werror \
$(GST_CFLAGS) \
-I $(top_srcdir) \
-I $(top_srcdir)/udp \
-I $(top_srcdir)/socket \
-I $(top_srcdir)/agent \
-I $(top_srcdir)/random \
-I $(top_srcdir)/address \
......
......@@ -32,7 +32,7 @@ AM_CFLAGS = \
-I $(top_srcdir)/address \
-I $(top_srcdir)/agent \
-I $(top_srcdir)/random \
-I $(top_srcdir)/udp \
-I $(top_srcdir)/socket \
-I $(top_srcdir)/stun
EXTRA_PROGRAMS = \
......
......@@ -13,37 +13,24 @@ AM_CFLAGS = \
$(GLIB_CFLAGS) \
-I $(top_srcdir)/address
COMMON_LDADD = libudp.la $(GLIB_LIBS) $(top_builddir)/address/libaddress.la
COMMON_LDADD = libsocket.la $(GLIB_LIBS) $(top_builddir)/address/libaddress.la $(top_builddir)/stun/libstun.la
noinst_LTLIBRARIES = libudp.la
noinst_LTLIBRARIES = libsocket.la
libudp_la_SOURCES = \
udp.h \
udp-generic.c \
libsocket_la_SOURCES = \
socket.h \
socket.c \
udp-bsd.h \
udp-bsd.c \
udp-turn.h \
udp-turn.c \
udp-fake.h \
udp-fake.c
udp-turn.c
noinst_PROGRAMS = udp-client udp-echo-server
udp_client_LDADD = $(COMMON_LDADD)
udp_echo_server_LDADD = $(COMMON_LDADD)
check_PROGRAMS = test-fake test-bsd
dist_check_SCRIPTS = test-echo.sh
test_fake_LDADD = $(COMMON_LDADD)
check_PROGRAMS = test-bsd
test_bsd_LDADD = $(COMMON_LDADD)
test-echo.sh::
chmod +x $(srcdir)/$@
TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS)
TESTS = $(check_PROGRAMS)
pkginclude_HEADERS = udp.h udp-fake.h udp-bsd.h
pkginclude_HEADERS = socket.h udp-bsd.h udp-turn.h
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