From d76133046518e71025000ec6322f5b8f1c98529f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 8 Apr 2015 18:47:06 -0700 Subject: [PATCH] No more tap factories. --- {osdep => attic}/BSDEthernetTapFactory.cpp | 0 {osdep => attic}/BSDEthernetTapFactory.hpp | 0 {osdep => attic}/LinuxEthernetTapFactory.cpp | 0 {osdep => attic}/LinuxEthernetTapFactory.hpp | 0 {osdep => attic}/OSXEthernetTapFactory.cpp | 0 {osdep => attic}/OSXEthernetTapFactory.hpp | 0 {osdep => attic}/WindowsEthernetTapFactory.cpp | 0 {osdep => attic}/WindowsEthernetTapFactory.hpp | 0 make-freebsd.mk | 4 ++-- make-linux.mk | 4 ++-- make-mac.mk | 4 ++-- 11 files changed, 6 insertions(+), 6 deletions(-) rename {osdep => attic}/BSDEthernetTapFactory.cpp (100%) rename {osdep => attic}/BSDEthernetTapFactory.hpp (100%) rename {osdep => attic}/LinuxEthernetTapFactory.cpp (100%) rename {osdep => attic}/LinuxEthernetTapFactory.hpp (100%) rename {osdep => attic}/OSXEthernetTapFactory.cpp (100%) rename {osdep => attic}/OSXEthernetTapFactory.hpp (100%) rename {osdep => attic}/WindowsEthernetTapFactory.cpp (100%) rename {osdep => attic}/WindowsEthernetTapFactory.hpp (100%) diff --git a/osdep/BSDEthernetTapFactory.cpp b/attic/BSDEthernetTapFactory.cpp similarity index 100% rename from osdep/BSDEthernetTapFactory.cpp rename to attic/BSDEthernetTapFactory.cpp diff --git a/osdep/BSDEthernetTapFactory.hpp b/attic/BSDEthernetTapFactory.hpp similarity index 100% rename from osdep/BSDEthernetTapFactory.hpp rename to attic/BSDEthernetTapFactory.hpp diff --git a/osdep/LinuxEthernetTapFactory.cpp b/attic/LinuxEthernetTapFactory.cpp similarity index 100% rename from osdep/LinuxEthernetTapFactory.cpp rename to attic/LinuxEthernetTapFactory.cpp diff --git a/osdep/LinuxEthernetTapFactory.hpp b/attic/LinuxEthernetTapFactory.hpp similarity index 100% rename from osdep/LinuxEthernetTapFactory.hpp rename to attic/LinuxEthernetTapFactory.hpp diff --git a/osdep/OSXEthernetTapFactory.cpp b/attic/OSXEthernetTapFactory.cpp similarity index 100% rename from osdep/OSXEthernetTapFactory.cpp rename to attic/OSXEthernetTapFactory.cpp diff --git a/osdep/OSXEthernetTapFactory.hpp b/attic/OSXEthernetTapFactory.hpp similarity index 100% rename from osdep/OSXEthernetTapFactory.hpp rename to attic/OSXEthernetTapFactory.hpp diff --git a/osdep/WindowsEthernetTapFactory.cpp b/attic/WindowsEthernetTapFactory.cpp similarity index 100% rename from osdep/WindowsEthernetTapFactory.cpp rename to attic/WindowsEthernetTapFactory.cpp diff --git a/osdep/WindowsEthernetTapFactory.hpp b/attic/WindowsEthernetTapFactory.hpp similarity index 100% rename from osdep/WindowsEthernetTapFactory.hpp rename to attic/WindowsEthernetTapFactory.hpp diff --git a/make-freebsd.mk b/make-freebsd.mk index 0830ad36e..a69dab344 100644 --- a/make-freebsd.mk +++ b/make-freebsd.mk @@ -6,8 +6,8 @@ DEFS= LIBS= include objects.mk -OBJS+=osdep/BSDEthernetTapFactory.o osdep/BSDEthernetTap.o -TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o +OBJS+=osdep/BSDEthernetTap.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) diff --git a/make-linux.mk b/make-linux.mk index e8ce11563..b3b0fefd2 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -7,8 +7,8 @@ DEFS= LIBS= include objects.mk -OBJS+=osdep/LinuxEthernetTap.o osdep/LinuxEthernetTapFactory.o -TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o +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) diff --git a/make-mac.mk b/make-mac.mk index 29ea48637..1a159c655 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -7,8 +7,8 @@ LIBS= ARCH_FLAGS=-arch i386 -arch x86_64 include objects.mk -OBJS+=osdep/OSXEthernetTap.o osdep/OSXEthernetTapFactory.o -TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o +OBJS+=osdep/OSXEthernetTap.o +TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o # Disable codesign since open source users will not have ZeroTier's certs CODESIGN=echo