--- elwix/build_3thparty.sh	2014/07/01 18:02:20	1.4.2.9
+++ elwix/build_3thparty.sh	2021/03/17 20:30:44	1.7.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_3thparty.sh,v 1.4.2.9 2014/07/01 18:02:20 misho Exp $
+# $Id: build_3thparty.sh,v 1.7.2.2 2021/03/17 20:30:44 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -44,7 +44,7 @@ fi
 
 clean_3th()
 {
-	echo "+++ Clean ELWIX 3th party ..."
+	echo "+++ Clean ELWIX 3th party ... ${PKG}, ${ROMFS_USR2}"
 
 	rm -rf ${PKG} ${ROMFS_USR2}
 
@@ -71,71 +71,12 @@ compile_3th()
 
 	BUILD_SH="./config/rc.3thparty_helper"
 
-	echo "${BUILD_SH} expat ${CBUILD} ${PKG} ${TARGET_BUILD}"
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} libevent ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} libiconv ${CGBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} pcre ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} mini_sendmail ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} choparp ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} scan_ffs ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} rsync ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} ttcp ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} mpd ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} igmpproxy ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} sudo ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} bmon ${CGBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} mtr ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} ipguard ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} smartmontools ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} quagga ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} iftop ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} arping ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} hping2 ${CGBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} trafshow ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} ipsec-tools ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} dhcp ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} dhcping ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} dnsmasq ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} miniupnpd ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	${BUILD_SH} miniupnpc ${CGBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-	echo ${BUILD_SH} ntp ${CBUILD} ${PKG} ${TARGET_BUILD}
-	${BUILD_SH} ntp ${CBUILD} ${PKG} ${TARGET_BUILD}
-	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} spawn-fcgi ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} lighttpd ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} libxml2 ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
-#	${BUILD_SH} php ${CBUILD} ${PKG} ${TARGET_BUILD}
-#	[ $? -ne 0 ] && exit 1
+	for i in ${CROSS_3THPARTY}; do
+		MK=$(eval echo "\$${i}_MAKE")
+		env CFLAGS="-I${PKG}/include" LDFLAGS="-L${PKG}/lib" ${BUILD_SH} \
+			$i $MK ${PKG} ${TARGET_BUILD} || Die "ERROR:: with $i packet!"
+	done
+
 	echo
 }
 
@@ -147,10 +88,11 @@ install_3th()
 	SBIN="${ROMFS_USR2}/sbin"
 	ETC="${ROMFS_USR2}/etc"
 
-	echo "+++ Install ELWIX RomFS secondary firmware ..."
+	echo "+++ Install ELWIX RomFS secondary firmware ... ${ROMFS_USR2}"
 
 	StripFiles \*.so\* ${PKG}/lib
 	InstallFiles \*.so\* ${PKG}/lib $LIBS
+	InstallLinks \*.so\* ${PKG}/lib $LIBS
 	StripFiles \* ${PKG}/libexec
 	InstallFiles \* ${PKG}/libexec $LIBEXEC
 	StripFiles \* ${PKG}/bin
@@ -165,7 +107,7 @@ install_3th()
 
 build_3th()
 {
-	echo "+++ Build ELWIX Firmware secondary image ..."
+	echo "+++ Build ELWIX Firmware secondary image ... ${ROMFS_USR2} --> ${REL}/${ROMFS_IMG2}"
 
 	cd ${ROMFS_USR2}
 	pax -w -z -v -f${REL}/${ROMFS_IMG2} .
@@ -181,9 +123,15 @@ build_3th()
 
 #	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2};
 #	mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}
+
+	echo "+++ Complited ELWIX Firmware secondary image ... ${REL}/${ROMFS_IMG2}"
 }
 
 ### main()
+if [ -n "${1}" ]; then
+	rm ${PKG}/elwix.ver
+fi
+
 if ! SnitVer ${PKG}/elwix.ver; then
 	clean_3th || exit 1
 	compile_3th || exit 1