From 8830214a1aa2ca54d5ef861fef8a8ec04c064b38 Mon Sep 17 00:00:00 2001
From: z3bra <contactatz3bradotorg>
Date: Mon, 14 Nov 2016 08:38:09 +0100
Subject: Revert "Compile against local toxcore submodule"

This reverts commit a1d2b63e6af32685f5828c302a0d3edeeb48090f.

Ratox now compiles against the latest version of the API, so there is no
need for using a local submodule anymore.
---
 Makefile  | 7 +------
 config.mk | 8 +++-----
 ratox.c   | 6 +++---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 5025acd..75fb613 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,10 @@ include config.mk
 .POSIX:
 .SUFFIXES: .c .o
 
-TOXSRC = $(shell find toxcore/toxcore toxcore/toxav toxcore/toxencryptsave -name '*.c')
-
 HDR = arg.h config.h nodes.h readpassphrase.h util.h
 LIB = \
 	eprintf.o \
-	readpassphrase.o \
-	$(TOXSRC:.c=.o)
+	readpassphrase.o
 SRC = \
 	ratox.c
 
@@ -24,8 +21,6 @@ binlib: util.a
 
 bin: $(BIN)
 
-$(BIN): util.a $(OBJ)
-
 $(OBJ): $(HDR) config.mk
 
 config.h:
diff --git a/config.mk b/config.mk
index 92f54e5..50198b6 100644
--- a/config.mk
+++ b/config.mk
@@ -5,10 +5,8 @@ VERSION = 0.2.1
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
-TOX_CFLAGS = -I./toxcore/toxcore -I./toxcore/toxav -I./toxcore/toxencryptsave -I/usr/include/opus
-
 CC = cc
 LD = $(CC)
-CPPFLAGS = -DVERSION=\"${VERSION}\" $(TOX_CFLAGS)
-CFLAGS   = -g -Wall -Wunused $(CPPFLAGS)
-LDFLAGS  = -g -lopus -lvpx -lpthread -lsodium
+CPPFLAGS = -DVERSION=\"${VERSION}\"
+CFLAGS   = -g -I/usr/local/include -Wall -Wunused $(CPPFLAGS)
+LDFLAGS  = -g -L/usr/local/lib -ltoxcore -ltoxav -ltoxencryptsave
diff --git a/ratox.c b/ratox.c
index cbd8a47..282f714 100644
--- a/ratox.c
+++ b/ratox.c
@@ -19,9 +19,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "tox.h"
-#include "toxav.h"
-#include "toxencryptsave.h"
+#include <tox/tox.h>
+#include <tox/toxav.h>
+#include <tox/toxencryptsave.h>
 
 #include "arg.h"
 #include "queue.h"
-- 
cgit v1.2.3