diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 15:12:09 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 15:12:09 -0700 |
| commit | 6369c264e2b54f7eb65a9f0f071ef7599ec7b20a (patch) | |
| tree | b2570a21eb6d02040256d8a84855361da8c19e75 /make-linux.mk | |
| parent | 871473255b7b0c5ad6507f0fe62ca6998a41f678 (diff) | |
| download | infinitytier-6369c264e2b54f7eb65a9f0f071ef7599ec7b20a.tar.gz infinitytier-6369c264e2b54f7eb65a9f0f071ef7599ec7b20a.zip | |
Rename netconf to controller and NetworkConfigMaster to NetworkController for consistency.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/make-linux.mk b/make-linux.mk index d06f6cf7..c0fe973e 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -8,7 +8,6 @@ LIBS= include objects.mk OBJS+=osdep/LinuxEthernetTap.o -TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o # Enable SSE-optimized Salsa20 on x86 and x86_64 machines MACHINE=$(shell uname -m) @@ -31,13 +30,6 @@ ifeq ($(MACHINE),x86) DEFS+=-DZT_SALSA20_SSE 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+=-lsqlite3 - OBJS+=netconf/SqliteNetworkConfigMaster.o -endif - # "make official" is a shortcut for this ifeq ($(ZT_OFFICIAL_RELEASE),1) ZT_AUTO_UPDATE=1 @@ -71,8 +63,8 @@ CXXFLAGS=$(CFLAGS) -fno-rtti all: one -one: $(OBJS) main.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one main.o $(OBJS) $(LIBS) +one: $(OBJS) one.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) one.o $(LIBS) $(STRIP) zerotier-one ln -sf zerotier-one zerotier-cli ln -sf zerotier-one zerotier-idtool @@ -81,15 +73,11 @@ selftest: $(OBJS) selftest.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) $(STRIP) zerotier-selftest -testnet: $(TESTNET_OBJS) $(OBJS) testnet.o - $(CXX) $(CXXFLAGS) -o zerotier-testnet testnet.o $(OBJS) $(TESTNET_OBJS) $(LIBS) - $(STRIP) zerotier-testnet - installer: one FORCE ./buildinstaller.sh clean: - rm -rf *.o netconf/*.o node/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o zerotier-* build-* ZeroTierOneInstaller-* *.deb *.rpm + rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o zerotier-* build-* ZeroTierOneInstaller-* *.deb *.rpm debug: FORCE make -j 4 ZT_DEBUG=1 |