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/rsync/Makefile | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'package/rsync')

diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index f7c2ff8a7..197840fc2 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -20,11 +20,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+=		-static
-TARGET_LDFLAGS+=	-static
-endif
-
 rsync-install:
 	${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin
-- 
cgit v1.2.3