From bf5c07f79a0f78e714fe47a5d1e09330022261ea Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Sat, 3 Aug 2013 12:53:46 -0400
Subject: Scratch that... more work wiring up netconf. Got to handle OK.

---
 Makefile.linux | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile.linux')

diff --git a/Makefile.linux b/Makefile.linux
index 33b88bad..fef28474 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -2,17 +2,16 @@ CC=gcc
 CXX=g++
 
 INCLUDES=-Iext/bin/libcrypto/include -Iext/jsoncpp/include
-LDFLAGS=-ldl
 ARCH=$(shell uname -m)
 DEFS=-DZT_ARCH="$(ARCH)" -DZT_OSNAME="linux" -DZT_TRACE
 
 # Uncomment for a release optimized build
-CFLAGS=-Wall -O3 -fno-unroll-loops -fstack-protector -pthread $(INCLUDES) $(LDFLAGS) -DNDEBUG $(DEFS)
-STRIP=strip --strip-all
+#CFLAGS=-Wall -O3 -fno-unroll-loops -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+#STRIP=strip --strip-all
 
 # Uncomment for a debug build
-#CFLAGS=-Wall -g -pthread $(INCLUDES) $(LDFLAGS) -DZT_TRACE -DZT_LOG_STDOUT $(DEFS)
-#STRIP=echo
+CFLAGS=-Wall -g -pthread $(INCLUDES) -DZT_TRACE -DZT_LOG_STDOUT $(DEFS)
+STRIP=echo
 
 CXXFLAGS=$(CFLAGS) -fno-rtti
 
@@ -21,7 +20,7 @@ CXXFLAGS=$(CFLAGS) -fno-rtti
 # separate binaries for the RedHat and Debian universes to distribute via
 # auto-update. This way we get one Linux binary for all systems of a given
 # architecture.
-LIBS=ext/bin/libcrypto/linux-$(ARCH)/libcrypto.a -lm
+LIBS=ext/bin/libcrypto/linux-$(ARCH)/libcrypto.a -lm -ldl
 
 include objects.mk
 
-- 
cgit v1.2.3