gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Netconf build fixes, schema, etc.

Browse Source
This commit is contained in:
Adam Ierymenko
2015-03-12 14:03:53 -07:00
parent fab951e98a
commit 31bf0a4ea6
10 changed files with 146 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
make-linux.mk
View File

@@ -7,8 +7,8 @@ DEFS=
LIBS=
include objects.mk
OBJS+=osnet/LinuxRoutingTable.o osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o
TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o testnet/TestRoutingTable.o
OBJS+=osnet/LinuxRoutingTable.o osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o
TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o testnet/TestRoutingTable.o
# Enable SSE-optimized Salsa20 on x86 and x86_64 machines
MACHINE=$(shell uname -m)
@@ -34,7 +34,8 @@ endif
# Build with ZT_ENABLE_NETCONF_MASTER=1 to build with NetworkConfigMaster enabled
ifeq ($(ZT_ENABLE_NETCONF_MASTER),1)
DEFS+=-DZT_ENABLE_NETCONF_MASTER
LIBS+=-lhiredis
LIBS+=-lsqlite3
OBJS+=netconf/SqliteNetworkConfigMaster.o
endif
# "make official" is a shortcut for this