pkg-config and av

3 files changed, 3 insertions, 11 deletions

diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 30879f65..b5953f8f 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -19,8 +19,7 @@ libtoxav_la_SOURCES = ../toxav/event.h \
 libtoxav_la_CFLAGS = -I../toxcore \
                      -I../toxav \
                      $(NACL_CFLAGS) \
-                     $(OPUS_CFLAGS) \
-                     $(VPX_CFLAGS) \
+                     $(AV_CFLAGS) \
                      $(PTHREAD_CFLAGS)
 
 libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
@@ -28,9 +27,8 @@ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
                       $(EXTRA_LT_LDFLAGS)
                       
 libtoxav_la_LIBS =    $(NACL_LIBS) \
-                      $(OPUS_LIBS) \
-                      $(VPX_LIBS) \
-                      $(PTHREAD_LIBS)
+                      $(PTHREAD_LIBS) \
+                      $(AV_LIBS)
 
                         
 endif
diff --git a/toxav/event.c b/toxav/event.c
index f79fd60e..ffda35ec 100644
--- a/toxav/event.c
+++ b/toxav/event.c
@@ -29,9 +29,6 @@
 #include <stdlib.h>
 #include "event.h"
 
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-
 #define _GNU_SOURCE
 
 #include <assert.h>
diff --git a/toxav/msi.c b/toxav/msi.c
index fda0dd3e..e5e1e1c5 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -30,9 +30,6 @@
 
 #include "msi.h"
 #include "event.h"
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-#include "../toxcore/Messenger.h"
 
 #include <assert.h>
 #include <unistd.h>