--- a/Makefile	Sun Feb 22 03:57:44 2009 +0200
+++ b/Makefile	Sun Feb 22 05:27:29 2009 +0200
@@ -1,8 +1,3 @@
-#LIBEVENT_PATH = ~/opt
-#LIBRARY_PATHS = -L${LIBEVENT_PATH}/lib
-#INCLUDE_PATHS = -I${LIBEVENT_PATH}/include
-LDLIBS = -levent
-
 # default is test
 ifndef MODE
 MODE = test
@@ -20,6 +15,15 @@
 
 FIXED_CFLAGS = -Wall -std=gnu99
 
+# libevent
+LIBEVENT_CFLAGS = 
+LIBEVENT_LDFLAGS = -levent
+
+# GnuTLS stuff
+GNUTLS_NAME = "gnutls"
+GNUTLS_CFLAGS = $(shell pkg-config ${GNUTLS_NAME} --cflags)
+GNUTLS_LDFLAGS = $(shell pkg-config ${GNUTLS_NAME} --libs)
+
 BIN_NAMES = nexus
 BIN_PATHS = $(addprefix bin/,$(BIN_NAMES))
 
@@ -27,6 +31,7 @@
 module_objs = $(patsubst src/%.c,obj/%.o,$(wildcard src/$(1)/*.c))
 
 SOCK_OBJS = obj/sock.o obj/sock_tcp.o
+SOCK_GNUTLS_OBJS = obj/sock_gnutls.o
 
 # XXX: not yet there
 #CORE_OBJS = obj/lib/log.o obj/lib/signals.o
@@ -35,13 +40,16 @@
 all: ${BIN_PATHS}
 
 # binaries
-bin/nexus: ${SOCK_OBJS}
+bin/nexus: ${SOCK_OBJS} ${SOCK_GNUTLS_OBJS}
 
 # computed
-LDFLAGS = ${LIBRARY_PATHS}
-CPPFLAGS = ${INCLUDE_PATHS} ${DEFINES}
-CFLAGS = ${MODE_CFLAGS} ${FIXED_CFLAGS}
+CFLAGS = ${MODE_CFLAGS} ${FIXED_CFLAGS} ${LIBEVENT_CFLAGS} ${GNUTLS_CFLAGS}
+LDFLAGS = ${LIBEVENT_LDFLAGS} ${GNUTLS_LDFLAGS}
 
+# XXX: is this valid?
+CPPFLAGS = ${CFLAGS}
+
+# names for src/
 SRC_PATHS = $(wildcard src/*.c) $(wildcard src/*/*.c)
 SRC_NAMES = $(patsubst src/%,%,$(SRC_PATHS))
 SRC_DIRS = $(dir $(SRC_NAMES))