summaryrefslogtreecommitdiff
path: root/make-linux.mk
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-05-28 03:13:23 +0000
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-05-28 03:13:23 +0000
commitea419c21d0c429cb43b157aa66b8a6845838bdc8 (patch)
tree9c067041d65c7ea618884a5362345bf7debba373 /make-linux.mk
parent502cd6921f65f0f15dc5be80df1469c05b1412fe (diff)
downloadinfinitytier-ea419c21d0c429cb43b157aa66b8a6845838bdc8.tar.gz
infinitytier-ea419c21d0c429cb43b157aa66b8a6845838bdc8.zip
Fix installer path, add netconf option to make-linux.
Diffstat (limited to 'make-linux.mk')
-rw-r--r--make-linux.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/make-linux.mk b/make-linux.mk
index fbd6d254..5a76c546 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -39,6 +39,13 @@ ifeq ($(ZT_AUTO_UPDATE),1)
DEFS+=-DZT_AUTO_UPDATE
endif
+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller
+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
+ DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
+ LIBS+=-L/usr/local/lib -lsqlite3
+ OBJS+=controller/SqliteNetworkController.o
+endif
+
# "make debug" is a shortcut for this
ifeq ($(ZT_DEBUG),1)
DEFS+=-DZT_TRACE
@@ -74,7 +81,7 @@ selftest: $(OBJS) selftest.o
$(STRIP) zerotier-selftest
installer: one FORCE
- ./buildinstaller.sh
+ ./ext/installfiles/linux/buildinstaller.sh
clean:
rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm