From 31bf0a4ea69a4ad0f7adaf58f1dad077d3dac953 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 12 Mar 2015 14:03:53 -0700 Subject: Netconf build fixes, schema, etc. --- make-linux.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index d91284db..67a63a7b 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -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 -- cgit v1.2.3