Commit b7264ba9 authored by Youness Alaoui's avatar Youness Alaoui

Change the top_srcdir and ../ directories from Makefile.am to use top_builddir where needed

parent c4020daf
...@@ -58,12 +58,12 @@ libagent_la_SOURCES = \ ...@@ -58,12 +58,12 @@ libagent_la_SOURCES = \
$(BUILT_SOURCES) $(BUILT_SOURCES)
libagent_la_LIBADD = \ libagent_la_LIBADD = \
../random/librandom.la \ $(top_builddir)/random/librandom.la \
../socket/libsocket.la \ $(top_builddir)/socket/libsocket.la \
../stun/libstun.la $(top_builddir)/stun/libstun.la
libagent_la_DEPENDENCIES = \ libagent_la_DEPENDENCIES = \
../random/librandom.la \ $(top_builddir)/random/librandom.la \
../socket/libsocket.la \ $(top_builddir)/socket/libsocket.la \
../stun/libstun.la $(top_builddir)/stun/libstun.la
pkginclude_HEADERS = agent.h candidate.h debug.h address.h interfaces.h pkginclude_HEADERS = agent.h candidate.h debug.h address.h interfaces.h
...@@ -12,12 +12,12 @@ lib_LTLIBRARIES = libnice.la ...@@ -12,12 +12,12 @@ lib_LTLIBRARIES = libnice.la
libnice_la_SOURCES = libnice_la_SOURCES =
libnice_la_DEPENDENCIES = \ libnice_la_DEPENDENCIES = \
../agent/libagent.la \ $(top_builddir)/agent/libagent.la \
libnice.sym libnice.sym
libnice_la_LIBADD = \ libnice_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
../agent/libagent.la $(top_builddir)/agent/libagent.la
libnice_la_LDFLAGS = \ libnice_la_LDFLAGS = \
-export-symbols $(srcdir)/libnice.sym \ -export-symbols $(srcdir)/libnice.sym \
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
include $(top_srcdir)/common.mk include $(top_srcdir)/common.mk
AM_CPPFLAGS = -I$(top_srcdir) AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = -std=gnu99 AM_CFLAGS = -std=gnu99
LDADD = ../libstun.la LDADD = $(top_builddir)/stun/libstun.la
check_PROGRAMS = \ check_PROGRAMS = \
test-parse \ test-parse \
......
...@@ -16,10 +16,10 @@ bin_PROGRAMS = stunbdc stund ...@@ -16,10 +16,10 @@ bin_PROGRAMS = stunbdc stund
check_PROGRAMS = stund check_PROGRAMS = stund
stund_SOURCES = stund.c stund.h stund_SOURCES = stund.c stund.h
stund_LDADD = ../libstun.la stund_LDADD = $(top_builddir)/stun/libstun.la
stunbdc_SOURCES = stunbdc.c stunbdc_SOURCES = stunbdc.c
stunbdc_LDADD = ../libstun.la stunbdc_LDADD = $(top_builddir)/stun/libstun.la
...@@ -16,7 +16,7 @@ AM_CFLAGS = \ ...@@ -16,7 +16,7 @@ AM_CFLAGS = \
-I $(top_srcdir)/socket \ -I $(top_srcdir)/socket \
-I $(top_srcdir)/stun -I $(top_srcdir)/stun
COMMON_LDADD = $(top_srcdir)/agent/libagent.la $(top_srcdir)/socket/libsocket.la $(GLIB_LIBS) COMMON_LDADD = $(top_builddir)/agent/libagent.la $(top_builddir)/socket/libsocket.la $(GLIB_LIBS)
check_PROGRAMS = \ check_PROGRAMS = \
test-bsd \ test-bsd \
......
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