diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-12 14:03:53 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-12 14:03:53 -0700 |
| commit | 31bf0a4ea69a4ad0f7adaf58f1dad077d3dac953 (patch) | |
| tree | 107fe41c25419a811feadf1fc7842534dc24f184 /make-linux.mk | |
| parent | fab951e98ab576c473f6f0450af2c842b5015478 (diff) | |
| download | infinitytier-31bf0a4ea69a4ad0f7adaf58f1dad077d3dac953.tar.gz infinitytier-31bf0a4ea69a4ad0f7adaf58f1dad077d3dac953.zip | |
Netconf build fixes, schema, etc.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 7 |
1 files changed, 4 insertions, 3 deletions
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 |