summaryrefslogtreecommitdiff
path: root/toxcore/Makefile.inc
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2016-08-30 17:50:59 +0100
committeriphydf <iphydf@users.noreply.github.com>2016-08-30 19:31:40 +0100
commitfa3b51266bdc13a6b5fafdc2518f89b03e5f084f (patch)
tree582c9e7a2ca197aab4fc90b1ec26821ae1765e30 /toxcore/Makefile.inc
parent4692cea75e82d05c4facf97c8853819281f376cf (diff)
Add missing #includes to headers and rename tox_old to tox_group.
Also, no longer #include the group code into tox.c. Instead, compile it separately in tox_group.c. This is a bit less surprising to someone looking around the code. Having some implementations in a .h file is certainly a bit surprising to a disciplined C programmer, especially when there is no technical reason to do it.
Diffstat (limited to 'toxcore/Makefile.inc')
-rw-r--r--toxcore/Makefile.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index d6b67eb2..f73ac3e9 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -2,7 +2,7 @@ lib_LTLIBRARIES += libtoxcore.la
2 2
3libtoxcore_la_include_HEADERS = \ 3libtoxcore_la_include_HEADERS = \
4 ../toxcore/tox.h \ 4 ../toxcore/tox.h \
5 ../toxcore/tox_old.h 5 ../toxcore/tox_group.h
6 6
7libtoxcore_la_includedir = $(includedir)/tox 7libtoxcore_la_includedir = $(includedir)/tox
8 8
@@ -28,6 +28,7 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
28 ../toxcore/ping.c \ 28 ../toxcore/ping.c \
29 ../toxcore/tox.h \ 29 ../toxcore/tox.h \
30 ../toxcore/tox.c \ 30 ../toxcore/tox.c \
31 ../toxcore/tox_group.c \
31 ../toxcore/util.h \ 32 ../toxcore/util.h \
32 ../toxcore/util.c \ 33 ../toxcore/util.c \
33 ../toxcore/group.h \ 34 ../toxcore/group.h \
@@ -50,8 +51,7 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
50 ../toxcore/TCP_connection.c \ 51 ../toxcore/TCP_connection.c \
51 ../toxcore/list.c \ 52 ../toxcore/list.c \
52 ../toxcore/list.h \ 53 ../toxcore/list.h \
53 ../toxcore/misc_tools.h \ 54 ../toxcore/misc_tools.h
54 ../toxcore/tox_old_code.h
55 55
56libtoxcore_la_CFLAGS = -I$(top_srcdir) \ 56libtoxcore_la_CFLAGS = -I$(top_srcdir) \
57 -I$(top_srcdir)/toxcore \ 57 -I$(top_srcdir)/toxcore \