From 7576911951781baf8730ee3e166cb6efc73322bf Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 10 Apr 2015 11:42:02 -0700
Subject: [PATCH] Temporarily shelve testnet/ -- will resurrect self-contained
 testnet later perhaps, but probably will not by the time next version ships.
 Was mostly for debugging multicast anyway and that is now quite stable.

---
 {testnet => attic/testnet}/MTQ.hpp                    | 0
 {testnet => attic/testnet}/README.md                  | 0
 {testnet => attic/testnet}/SimNet.cpp                 | 0
 {testnet => attic/testnet}/SimNet.hpp                 | 0
 {testnet => attic/testnet}/SimNetSocketManager.cpp    | 0
 {testnet => attic/testnet}/SimNetSocketManager.hpp    | 0
 {testnet => attic/testnet}/TestEthernetTap.cpp        | 0
 {testnet => attic/testnet}/TestEthernetTap.hpp        | 0
 {testnet => attic/testnet}/TestEthernetTapFactory.cpp | 0
 {testnet => attic/testnet}/TestEthernetTapFactory.hpp | 0
 make-freebsd.mk                                       | 2 +-
 make-linux.mk                                         | 2 +-
 12 files changed, 2 insertions(+), 2 deletions(-)
 rename {testnet => attic/testnet}/MTQ.hpp (100%)
 rename {testnet => attic/testnet}/README.md (100%)
 rename {testnet => attic/testnet}/SimNet.cpp (100%)
 rename {testnet => attic/testnet}/SimNet.hpp (100%)
 rename {testnet => attic/testnet}/SimNetSocketManager.cpp (100%)
 rename {testnet => attic/testnet}/SimNetSocketManager.hpp (100%)
 rename {testnet => attic/testnet}/TestEthernetTap.cpp (100%)
 rename {testnet => attic/testnet}/TestEthernetTap.hpp (100%)
 rename {testnet => attic/testnet}/TestEthernetTapFactory.cpp (100%)
 rename {testnet => attic/testnet}/TestEthernetTapFactory.hpp (100%)

diff --git a/testnet/MTQ.hpp b/attic/testnet/MTQ.hpp
similarity index 100%
rename from testnet/MTQ.hpp
rename to attic/testnet/MTQ.hpp
diff --git a/testnet/README.md b/attic/testnet/README.md
similarity index 100%
rename from testnet/README.md
rename to attic/testnet/README.md
diff --git a/testnet/SimNet.cpp b/attic/testnet/SimNet.cpp
similarity index 100%
rename from testnet/SimNet.cpp
rename to attic/testnet/SimNet.cpp
diff --git a/testnet/SimNet.hpp b/attic/testnet/SimNet.hpp
similarity index 100%
rename from testnet/SimNet.hpp
rename to attic/testnet/SimNet.hpp
diff --git a/testnet/SimNetSocketManager.cpp b/attic/testnet/SimNetSocketManager.cpp
similarity index 100%
rename from testnet/SimNetSocketManager.cpp
rename to attic/testnet/SimNetSocketManager.cpp
diff --git a/testnet/SimNetSocketManager.hpp b/attic/testnet/SimNetSocketManager.hpp
similarity index 100%
rename from testnet/SimNetSocketManager.hpp
rename to attic/testnet/SimNetSocketManager.hpp
diff --git a/testnet/TestEthernetTap.cpp b/attic/testnet/TestEthernetTap.cpp
similarity index 100%
rename from testnet/TestEthernetTap.cpp
rename to attic/testnet/TestEthernetTap.cpp
diff --git a/testnet/TestEthernetTap.hpp b/attic/testnet/TestEthernetTap.hpp
similarity index 100%
rename from testnet/TestEthernetTap.hpp
rename to attic/testnet/TestEthernetTap.hpp
diff --git a/testnet/TestEthernetTapFactory.cpp b/attic/testnet/TestEthernetTapFactory.cpp
similarity index 100%
rename from testnet/TestEthernetTapFactory.cpp
rename to attic/testnet/TestEthernetTapFactory.cpp
diff --git a/testnet/TestEthernetTapFactory.hpp b/attic/testnet/TestEthernetTapFactory.hpp
similarity index 100%
rename from testnet/TestEthernetTapFactory.hpp
rename to attic/testnet/TestEthernetTapFactory.hpp
diff --git a/make-freebsd.mk b/make-freebsd.mk
index a69dab344..bfa2c13c5 100644
--- a/make-freebsd.mk
+++ b/make-freebsd.mk
@@ -48,7 +48,7 @@ endif
 
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
-#	DEFS+=-DZT_TRACE -DZT_LOG_STDOUT 
+	DEFS+=-DZT_TRACE 
 	CFLAGS=-Wall -g -pthread $(INCLUDES) $(DEFS)
 	LDFLAGS=
 	STRIP=echo
diff --git a/make-linux.mk b/make-linux.mk
index b3b0fefd2..d4cb9d89b 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -49,7 +49,7 @@ endif
 
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
-#	DEFS+=-DZT_TRACE -DZT_LOG_STDOUT 
+	DEFS+=-DZT_TRACE 
 	CFLAGS=-Wall -g -pthread $(INCLUDES) $(DEFS)
 	LDFLAGS=
 	STRIP=echo