diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-29 16:32:24 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-29 16:32:24 -0700 |
| commit | 4c59497b95e2fbd56a79f880251b960c1c801d0c (patch) | |
| tree | b0f236ba316b66e55d7d24e20b658db45f85a4ea /make-linux.mk | |
| parent | 5484cf43098048486418803746e1a15e056a8444 (diff) | |
| download | infinitytier-4c59497b95e2fbd56a79f880251b960c1c801d0c.tar.gz infinitytier-4c59497b95e2fbd56a79f880251b960c1c801d0c.zip | |
Linux build fixes for testnet.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/make-linux.mk b/make-linux.mk index 46520b9c..60b0b9c3 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -6,6 +6,10 @@ INCLUDES= 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 + # Enable SSE-optimized Salsa20 on x86 and x86_64 machines MACHINE=$(shell uname -m) ifeq ($(MACHINE),x86_64) @@ -58,9 +62,6 @@ endif CXXFLAGS=$(CFLAGS) -fno-rtti -include objects.mk -OBJS+=osnet/LinuxRoutingTable.o osnet/LinuxEthernetTap.o osnet/LinuxEthernetTapFactory.o - all: one one: $(OBJS) main.o @@ -73,11 +74,15 @@ 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 $(OBJS) node/*.o osnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* + rm -rf $(OBJS) $(TESTNET_OBJS) node/*.o osnet/*.o control/*.o testnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* debug: FORCE make -j 4 ZT_DEBUG=1 |