From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/ttcp/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'package/ttcp/Makefile')

diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index b0915953b..c8a82e41a 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ttcp
 PKG_VERSION:=		3.8
 PKG_RELEASE:=		1
-PKG_DESCR:=		A small utility to test TCP connection performance
-PKG_SECTION:=		net
+PKG_DESCR:=		small utility to test tcp connection performance
+PKG_SECTION:=		net/perf
 
 NO_DISTFILES:=		1
 
@@ -19,8 +19,6 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
-TARGET_CFLAGS+=		-Wall
-
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/ttcp ${WRKBUILD}/ttcp.c
-- 
cgit v1.2.3