1 files changed, 13 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ef572e6..7617e07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,20 @@
-SOURCES = main.c
+SOURCES = $(wildcard *.c)
-DEPS=
+DEPS=libtoxcore
 CC=gcc
-CFLAGS=-g
+CFLAGS=-g #-std=c99
+CFLAGS += $(shell pkg-config --cflags $(DEPS))
+LDFLAGS=-g -pthread -lm -static
+LDFLAGS += $(shell pkg-config --libs $(DEPS))
 OBJECTS=$(SOURCES:.c=.o)
+INCLUDES = $(wildcard *.h)
-.c.o:
+.c.o: $(INCLUDES)
        $(CC) $(CFLAGS) $< -c -o $@
-tuntox: $(OBJECTS)
+tuntox: $(OBJECTS) $(INCLUDES)
-        $(CC) --static -o $@ -ltoxcore $^ $(CFLAGS) /usr/local/lib/libsodium.a
+        $(CC) -o $@ $(OBJECTS) -ltoxcore -lpthread $(LDFLAGS) /usr/local/lib/libsodium.a /usr/local/lib/libtoxcore.a
-all: tuntox
+cscope.out:
+        cscope -bv ./*.[ch] 
+all: cscope.out tuntox

diff --git a/Makefile b/Makefile index ef572e6..7617e07 100644 --- a/Makefile +++ b/Makefile
@@ -1,14 +1,20 @@
1	SOURCES = main.c	1	SOURCES = $(wildcard *.c)
2	DEPS=	2	DEPS=libtoxcore
3	CC=gcc	3	CC=gcc
4	CFLAGS=-g	4	CFLAGS=-g #-std=c99
		5	CFLAGS += $(shell pkg-config --cflags $(DEPS))
		6	LDFLAGS=-g -pthread -lm -static
		7	LDFLAGS += $(shell pkg-config --libs $(DEPS))
5	OBJECTS=$(SOURCES:.c=.o)	8	OBJECTS=$(SOURCES:.c=.o)
		9	INCLUDES = $(wildcard *.h)
6		10
7	.c.o:	11	.c.o: $(INCLUDES)
8	$(CC) $(CFLAGS) $< -c -o $@	12	$(CC) $(CFLAGS) $< -c -o $@
9		13
10	tuntox: $(OBJECTS)	14	tuntox: $(OBJECTS) $(INCLUDES)
11	$(CC) --static -o $@ -ltoxcore $^ $(CFLAGS) /usr/local/lib/libsodium.a	15	$(CC) -o $@ $(OBJECTS) -ltoxcore -lpthread $(LDFLAGS) /usr/local/lib/libsodium.a /usr/local/lib/libtoxcore.a
12		16
13	all: tuntox	17	cscope.out:
		18	cscope -bv ./*.[ch]
14		19
		20	all: cscope.out tuntox