diff options
author | AZ Huang <aitjcize@gmail.com> | 2014-03-05 18:51:22 +0800 |
---|---|---|
committer | AZ Huang <aitjcize@gmail.com> | 2014-03-05 20:04:19 +0800 |
commit | 7f3e1aec521466fd2d3d635bcf7b91474b9e3e49 (patch) | |
tree | 44dad2128240dec756ed3be538142e6a89614037 /toxav | |
parent | ce6440c5a20b3eefe478636a10778206a3454fb8 (diff) |
Fix libtoxav link error.
Diffstat (limited to 'toxav')
-rw-r--r-- | toxav/Makefile.inc | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index b5953f8f..0cad1840 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
@@ -25,25 +25,26 @@ libtoxav_la_CFLAGS = -I../toxcore \ | |||
25 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ | 25 | libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \ |
26 | $(NACL_LDFLAGS) \ | 26 | $(NACL_LDFLAGS) \ |
27 | $(EXTRA_LT_LDFLAGS) | 27 | $(EXTRA_LT_LDFLAGS) |
28 | 28 | ||
29 | libtoxav_la_LIBS = $(NACL_LIBS) \ | 29 | libtoxav_la_LIBADD = libtoxcore.la \ |
30 | $(NACL_LIBS) \ | ||
30 | $(PTHREAD_LIBS) \ | 31 | $(PTHREAD_LIBS) \ |
31 | $(AV_LIBS) | 32 | $(AV_LIBS) |
32 | 33 | ||
33 | 34 | ||
34 | endif | 35 | endif |
35 | 36 | ||
36 | 37 | ||
37 | 38 | ||
38 | 39 | ||
39 | 40 | ||
40 | 41 | ||
41 | if BUILD_PHONE | 42 | if BUILD_PHONE |
42 | 43 | ||
43 | 44 | ||
44 | noinst_PROGRAMS += phone | 45 | noinst_PROGRAMS += phone |
45 | 46 | ||
46 | phone_SOURCES = ../toxav/phone.c | 47 | phone_SOURCES = ../toxav/phone.c |
47 | 48 | ||
48 | phone_CFLAGS = -I../toxcore \ | 49 | phone_CFLAGS = -I../toxcore \ |
49 | -I../toxav \ | 50 | -I../toxav \ |
@@ -68,6 +69,6 @@ phone_LDADD = libtoxav.la \ | |||
68 | $(VPX_LIBS)\ | 69 | $(VPX_LIBS)\ |
69 | $(PTHREAD_LIBS)\ | 70 | $(PTHREAD_LIBS)\ |
70 | $(NACL_LIBS) | 71 | $(NACL_LIBS) |
71 | 72 | ||
72 | 73 | ||
73 | endif \ No newline at end of file | 74 | endif |