2 files changed, 45 insertions, 5 deletions

diff --git a/other/bootstrap_daemon/src/Makefile.inc b/other/bootstrap_daemon/src/Makefile.inc
new file mode 100644
index 00000000..a0d75fa0
--- /dev/null
+++ b/other/bootstrap_daemon/src/Makefile.inc
@@ -0,0 +1,38 @@
+if BUILD_DHT_BOOTSTRAP_DAEMON
+
+bin_PROGRAMS += tox-bootstrapd
+
+tox_bootstrapd_SOURCES = \
+                        ../other/bootstrap_daemon/src/command_line_arguments.c \
+                        ../other/bootstrap_daemon/src/command_line_arguments.h \
+                        ../other/bootstrap_daemon/src/config.c \
+                        ../other/bootstrap_daemon/src/config_defaults.h \
+                        ../other/bootstrap_daemon/src/config.h \
+                        ../other/bootstrap_daemon/src/log.c \
+                        ../other/bootstrap_daemon/src/log.h \
+                        ../other/bootstrap_daemon/src/tox-bootstrapd.c \
+                        ../other/bootstrap_node_packets.c \
+                        ../other/bootstrap_node_packets.h
+
+
+tox_bootstrapd_CFLAGS = \
+                        -I$(top_srcdir)/other/bootstrap_daemon \
+                        $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS) \
+                        $(LIBCONFIG_CFLAGS)
+
+tox_bootstrapd_LDADD = \
+                        $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBCONFIG_LIBS) \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_LIBS)
+
+endif
+
+EXTRA_DIST += \
+    $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \
+    $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.service \
+    $(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh
+    
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index 45b7add0..4883f885 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -30,19 +30,21 @@
 #include <string.h>
 
 // toxcore
-#include "../../toxcore/LAN_discovery.h"
-#include "../../toxcore/onion_announce.h"
-#include "../../toxcore/TCP_server.h"
-#include "../../toxcore/util.h"
+#include "../../../toxcore/LAN_discovery.h"
+#include "../../../toxcore/onion_announce.h"
+#include "../../../toxcore/TCP_server.h"
+#include "../../../toxcore/util.h"
+
 
 // misc
-#include "../bootstrap_node_packets.h"
+#include "../../bootstrap_node_packets.h"
 
 #include "command_line_arguments.h"
 #include "config.h"
 #include "global.h"
 #include "log.h"
 
+
 #define SLEEP_MILLISECONDS(MS) usleep(1000*MS)
 
 // Uses the already existing key or creates one if it didn't exist