From 263176bf91f9cdb225d26a6058a5e1f533e33936 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 30 Aug 2013 13:12:12 +0800
Subject: [PATCH] fix makefiles

---
 src/main/jni/iptables/extensions/Android.mk | 12 +++++++++---
 src/main/jni/iptables/iptables/Android.mk   |  1 -
 src/main/jni/openssl/crypto/Android.mk      |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/jni/iptables/extensions/Android.mk b/src/main/jni/iptables/extensions/Android.mk
index ef8dbd7f..2c172b6b 100644
--- a/src/main/jni/iptables/extensions/Android.mk
+++ b/src/main/jni/iptables/extensions/Android.mk
@@ -45,6 +45,7 @@ LOCAL_CFLAGS+=-D__ANDROID__
 MY_initext_func := $(addprefix xt_,${MY_pfx_build_mod})
 MY_GEN_INITEXT:= $(LOCAL_PATH)/gen_initext.c
 $(info $(shell \
+	if [ ! -e $(MY_GEN_INITEXT) ]; then \
 	echo "GEN initext.c"; \
 	echo "" >$(MY_GEN_INITEXT); \
 	for i in $(MY_initext_func); do \
@@ -57,7 +58,8 @@ $(info $(shell \
 		echo " ""lib$${i}_init();" >>$(MY_GEN_INITEXT); \
 		sed "s/_init(void)/lib$${i}_init(void)/" $(LOCAL_PATH)/lib$${i}.c > $(LOCAL_PATH)/gen_lib$${i}.c; \
 	done; \
-	echo "}" >>$(MY_GEN_INITEXT); ))
+	echo "}" >>$(MY_GEN_INITEXT); \
+	fi; ))
 
 MY_lib_sources:= \
 	$(patsubst %,gen_libxt_%.c,${MY_pfx_build_mod})
@@ -96,6 +98,7 @@ LOCAL_CFLAGS+=-D__ANDROID__
 MY_initext4_func  := $(addprefix ipt_,${MY_pf4_build_mod})
 MY_GEN_INITEXT4:= $(LOCAL_PATH)/gen_initext4.c
 $(info $(shell \
+	if [ ! -e $(MY_GEN_INITEXT4) ]; then \
 	echo "GEN initext4.c"; \
 	echo "" >$(MY_GEN_INITEXT4); \
 	for i in $(MY_initext4_func); do \
@@ -108,7 +111,8 @@ $(info $(shell \
 		echo " ""lib$${i}_init();" >>$(MY_GEN_INITEXT4); \
 		sed "s/_init(void)/lib$${i}_init(void)/" $(LOCAL_PATH)/lib$${i}.c > $(LOCAL_PATH)/gen_lib$${i}.c; \
 	done; \
-	echo "}" >>$(MY_GEN_INITEXT4); ))
+	echo "}" >>$(MY_GEN_INITEXT4); \
+	fi; ))
 
 MY_lib_sources:= \
 	$(patsubst %,gen_libipt_%.c,${MY_pf4_build_mod})
@@ -147,6 +151,7 @@ LOCAL_CFLAGS+=-D__ANDROID__
 MY_initext6_func := $(addprefix ip6t_,${MY_pf6_build_mod})
 MY_GEN_INITEXT6:= $(LOCAL_PATH)/gen_initext6.c
 $(info $(shell \
+	if [ ! -e $(MY_GEN_INITEXT6) ]; then \
 	echo "GEN initext6.c"; \
 	echo "" >$(MY_GEN_INITEXT6); \
 	for i in $(MY_initext6_func); do \
@@ -159,7 +164,8 @@ $(info $(shell \
 		echo " ""lib$${i}_init();" >>$(MY_GEN_INITEXT6); \
 		sed "s/_init(void)/lib$${i}_init(void)/" $(LOCAL_PATH)/lib$${i}.c > $(LOCAL_PATH)/gen_lib$${i}.c; \
 	done; \
-	echo "}" >>$(MY_GEN_INITEXT6); ))
+	echo "}" >>$(MY_GEN_INITEXT6); \
+	fi; ))
 
 MY_lib_sources:= \
 	$(patsubst %,gen_libip6t_%.c,${MY_pf6_build_mod})
diff --git a/src/main/jni/iptables/iptables/Android.mk b/src/main/jni/iptables/iptables/Android.mk
index b50976e5..190a482b 100644
--- a/src/main/jni/iptables/iptables/Android.mk
+++ b/src/main/jni/iptables/iptables/Android.mk
@@ -15,7 +15,6 @@ LOCAL_CFLAGS+=-DXTABLES_LIBDIR=\"xtables_libdir_not_used\"
 # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
 LOCAL_CFLAGS+=-D__ANDROID__
 
-LOCAL_LDFLAGS:=-version-info 6:0:0
 LOCAL_SRC_FILES:= \
 	xtables.c xtoptions.c
 
diff --git a/src/main/jni/openssl/crypto/Android.mk b/src/main/jni/openssl/crypto/Android.mk
index 8ce8ad17..9e72d711 100644
--- a/src/main/jni/openssl/crypto/Android.mk
+++ b/src/main/jni/openssl/crypto/Android.mk
@@ -556,7 +556,6 @@ include $(LOCAL_PATH)/../android-config.mk
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_CFLAGS += $(local_c_flags)
 LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_LDLIBS += -lz
 ifeq ($(TARGET_ARCH),arm)
 	LOCAL_SRC_FILES += $(arm_src_files)
 	LOCAL_CFLAGS += $(arm_cflags)