fix makefile uninstall delete the .h file bug,add the release and debug version

README.cn.md

@@ -16,7 +16,7 @@
 |基础数据结构|dict hash ringbuffer queue rbtree sort vector macro
 |网络库|rtsp rtmp skt p2p rpc ipc
 |异步|gevent workq thread
-|I/O解析|base64 config log file filewatcher strex
+|I/O解析|base64 config log file filewatcher strex submask
 |多媒体|uvc jpeg-ex mp4parser
 |其他|debug hal plugin time posix4win
 
@@ -29,11 +29,17 @@
    `> cd libraries\libposix4win\`  
    `> nmake /f Makefile.nmake clean`  
    `> nmake /f Makefile.nmake`  
+    默认debug版本，编译release版本
+   `> nmake /f Makefile.nmake clean`
+   `> nmake /f Makefile.nmake MODE=release`
 
 ### Linux  
   * linux 平台 (Ubuntu14.04 gcc-4.8.4+及以上版本 32/64 bit)  
    `$ cd libraries`  
-   `$ ./build.sh`  
+   `$ ./build.sh` 
+    默认debug版本，编译release版本
+   `$ ./build.sh {all|libxxx} linux release` 
+    安装
    `$ sudo ./build.sh install`
 
   * host(linux) target(rasberrypi)  
@@ -46,13 +52,16 @@
 
   * android arm 交叉编译  
    (需要下载 [android-ndk-r9-linux-x86_64.tar.bz2](http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2))  
-   `$ ./build.sh all android`  
+   `$ ./build.sh all android` 
+   默认debug版本，编译release版本
+   `$ ./build.sh {all|libxxx} android release` 
 
   * android 原生开发  
     also need ndk tools  
    `$ cd android_jni_libs`  
    `$ ndk-build`  
-
+	 默认debug版本，编译release版本
+	 `$ ndk-build MODE=release`  
    After install, the libxxx.xx will be installed in /usr/local/lib/.  
    libxxx.h, libxxx.so or libxxx.a of libraries are also in ./output/$(ARCH)  
 

README.md

@@ -29,11 +29,17 @@ This is a collection of basic libraries.
    `> cd libraries\libposix4win\`  
    `> nmake /f Makefile.nmake clean`  
    `> nmake /f Makefile.nmake`  
-
+	  default debug version, compiler release version
+   `> nmake /f Makefile.nmake clean`
+   `> nmake /f Makefile.nmake MODE=release`
+   
 ### Linux
   * linux platform (>= Ubuntu14.04 >= gcc-4.8.4 32/64 bit)  
    `$ cd libraries`  
    `$ ./build.sh`  
+   default debug version，compiler release version
+   `$ ./build.sh {all|libxxx} linux release` 
+    install
    `$ sudo ./build.sh install`
 
   * host(linux) target(rasberrypi)  
@@ -47,12 +53,15 @@ This is a collection of basic libraries.
   * android arm cross compile  
    (you need download [android-ndk-r9-linux-x86_64.tar.bz2](http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2))  
    `$ ./build.sh all android`  
+    default debug version，compiler release version
+   `$ ./build.sh {all|libxxx} android release`
 
   * android naitve develop  
     also need ndk tools  
    `$ cd android_jni_libs`  
    `$ ndk-build`  
-
+    default debug version，compiler release version
+	 `$ ndk-build MODE=release` 
    After install, the libxxx.xx will be installed in /usr/local/lib/.  
    libxxx.h, libxxx.so or libxxx.a of libraries are also in ./output/$(ARCH)  
 

build.sh

@@ -4,16 +4,23 @@ set -e
 CMD=$0
 MODULE=$1
 ARCH=$2
+MODE=$3
 
 #default is linux
 case $# in
 0)
 	MODULE=all;
-	ARCH=linux;;
+	ARCH=linux;
+	MODE=debug;;
 1)
-	ARCH=linux;;
+	ARCH=linux;
+	MODE=debug;;
+2)
+	MODE=debug;;
+	
 esac
 
+
 #add supported platform to here
 PLATFORM="[linux|pi|android|ios]"
 
@@ -27,22 +34,23 @@ NETWORK_LIBS="libskt librpc librtsp"
 usage()
 {
 	echo "==== usage ===="
-	echo "$CMD <module> [platform]"
+	echo "$CMD <module> [platform] [mode]"
 	echo "<module>: library to compile or all library, must needed"
 	echo "[platform]: linux, raspberrypi or android, default is linux, optional"
+	echo "[mode]: debug or release, default is debug, optional"
 	echo ""
-	echo "./build.sh all $PLATFORM"
-	echo "./build.sh basic_libs $PLATFORM"
-	echo "./build.sh network_libs $PLATFORM"
+	echo "./build.sh all $PLATFORM [debug|release]"
+	echo "./build.sh basic_libs $PLATFORM [debug|release]"
+	echo "./build.sh network_libs $PLATFORM [debug|release]"
 	echo ""
 	echo "basic libraries (must):"
 	for item in $BASIC_LIBS; do
-		echo "$CMD $item $PLATFORM";
+		echo "$CMD $item $PLATFORM [debug|release]";
 	done
 	echo ""
 	echo "network libraries (optional):"
 	for item in $NETWORK_LIBS; do
-		echo "$CMD $item $PLATFORM";
+		echo "$CMD $item $PLATFORM [debug|release]";
 	done
 	exit
 }
@@ -72,7 +80,7 @@ config_common()
 {
 	STRIP=${CROSS_PREFIX}strip
 	LIBS_DIR=`pwd`
-	OUTPUT=${LIBS_DIR}/output/${ARCH}
+	OUTPUT=${LIBS_DIR}/output/${ARCH}/
 }
 
 config_arch()
@@ -93,9 +101,9 @@ config_arch()
 
 check_output()
 {
-	if [ ! -d "${OUTPUT}" ]; then
+	if [ ! -d "${OUTPUT}/debug" ]; then
 		mkdir -p ${OUTPUT}/include
-		mkdir -p ${OUTPUT}/lib
+		mkdir -p ${OUTPUT}/{release,debug}/lib
 	fi
 }
 
@@ -122,7 +130,7 @@ build_module()
 		return
 		;;
 	"install")
-		MAKE="make ARCH=${ARCH}"
+		MAKE="make ARCH=${ARCH} MODE=${MODE}"
 		${MAKE} install > /dev/null
 		if [ $? -ne 0 ]; then
 			echo "==== install ${ARCH} ${MODULE} failed"
@@ -132,7 +140,7 @@ build_module()
 		fi
 		;;
 	"uninstall")
-		MAKE="make ARCH=${ARCH}"
+		MAKE="make ARCH=${ARCH} MODE=${MODE}"
 		${MAKE} uninstall > /dev/null
 		if [ $? -ne 0 ]; then
 			echo "==== uninstall ${ARCH} ${MODULE} failed"
@@ -142,7 +150,7 @@ build_module()
 		fi
 		;;
 	*)
-		MAKE="make ARCH=${ARCH} OUTPUT=${OUTPUT}"
+		MAKE="make ARCH=${ARCH} OUTPUT=${OUTPUT} MODE=${MODE}"
 		if [[ ${ARCH} == "linux" || ${ARCH} == "pi" || ${ARCH} == "android" ]]; then
 			${MAKE} > /dev/null
 		else
@@ -176,6 +184,8 @@ do_build()
 {
 	case $MODULE in
 	"all")
+		rm -rf output
+		check_output
 		build_all clean;
 		build_all;;
 	"clean")

build/autogen_lib.sh

@@ -9,6 +9,7 @@ LIBFOO_H=${MODULE}.h
 TEST_LIBFOO_C=test_${MODULE}.c
 README_MD=README.md
 ANDROID_MK=Android.mk
+NMAKE=Makefile.nmake
 VERSION_SH=version.sh
 
 LIBFOO_MACRO=`echo ${MODULE} | tr 'a-z' 'A-Z'`
@@ -103,6 +104,7 @@ CC	= ${S}(CROSS_PREFIX)gcc
 CXX	= ${S}(CROSS_PREFIX)g++
 LD	= ${S}(CROSS_PREFIX)ld
 AR	= ${S}(CROSS_PREFIX)ar
+STRIP   = ${S}(CROSS_PREFIX)strip
 
 ifeq (${S}(COLOR_INC), ${S}(wildcard ${S}(COLOR_INC)))
 include ${S}(COLOR_INC)
@@ -133,7 +135,13 @@ OBJS_UNIT_TEST	= test_${S}(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
-CFLAGS	:= -g -Wall -Werror -fPIC
+ifeq (${S}(MODE), release)
+CFLAGS  := -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
+CFLAGS  := -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= ${S}(${S}(ARCH)_CFLAGS)
 CFLAGS	+= -I${S}(OUTPUT)/include
 
@@ -178,16 +186,17 @@ clean:
 
 install:
 	${S}(MAKEDIR_OUTPUT)
+	if [ "${S}(MODE)" = "release" ];then ${S}(STRIP) ${S}(TGT); fi
 	${S}(CP_V) -r ${S}(TGT_LIB_H)  ${S}(OUTPUT)/include
-	${S}(CP_V) -r ${S}(TGT_LIB_A)  ${S}(OUTPUT)/lib
-	${S}(CP_V) -r ${S}(TGT_LIB_SO) ${S}(OUTPUT)/lib
-	${S}(CP_V) -r ${S}(TGT_LIB_SO_VER) ${S}(OUTPUT)/lib
+	${S}(CP_V) -r ${S}(TGT_LIB_A)  ${S}(OUTPUT)/${S}(LTYPE)/lib
+	${S}(CP_V) -r ${S}(TGT_LIB_SO) ${S}(OUTPUT)/${S}(LTYPE)/lib
+	${S}(CP_V) -r ${S}(TGT_LIB_SO_VER) ${S}(OUTPUT)/${S}(LTYPE)/lib
 
 uninstall:
-	${S}(RM_V) -f ${S}(OUTPUT)/include/${S}(TGT_LIB_H)
-	${S}(RM_V) -f ${S}(OUTPUT)/lib/${S}(TGT_LIB_A)
-	${S}(RM_V) -f ${S}(OUTPUT)/lib/${S}(TGT_LIB_SO)
-	${S}(RM_V) -f ${S}(OUTPUT)/lib/${S}(TGT_LIB_SO_VER)
+	cd ${S}(OUTPUT)/include/ && rm -f ${S}(TGT_LIB_H)
+	${S}(RM_V) -f ${S}(OUTPUT)/${S}(LTYPE)/lib/${S}(TGT_LIB_A)
+	${S}(RM_V) -f ${S}(OUTPUT)/${S}(LTYPE)/lib/${S}(TGT_LIB_SO)
+	${S}(RM_V) -f ${S}(OUTPUT)/${S}(LTYPE)/lib/${S}(TGT_LIB_SO_VER)
 !
 }
 
@@ -200,6 +209,10 @@ include ${S}(CLEAR_VARS)
 
 LOCAL_MODULE := ${MODULE}
 
+ifeq (${S}(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= ${S}(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := ${S}(LOCAL_PATH)
@@ -211,6 +224,66 @@ include ${S}(BUILD_SHARED_LIBRARY)
 !
 }
 
+autogen_makefile_nmake()
+{
+cat > ${NMAKE} <<!
+###############################################################################
+# common
+###############################################################################
+#ARCH: linux/pi/android/ios/win
+LD	= link
+AR	= lib
+RM	= del
+###############################################################################
+# target and object
+###############################################################################
+LIBNAME		= ${MODULE}
+TGT_LIB_A	= ${S}(LIBNAME).lib
+TGT_LIB_SO	= ${S}(LIBNAME).dll
+TGT_UNIT_TEST	= test_${S}(LIBNAME).exe
+
+OBJS_LIB	= ${S}(LIBNAME).obj
+OBJS_UNIT_TEST	= test_${S}(LIBNAME).obj
+
+###############################################################################
+# cflags and ldflags
+###############################################################################
+CFLAGS	= /Iinclude /I.
+!IF "${S}(MODE)"=="release"
+CFLAGS  = ${S}(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = ${S}(CFLAGS) /Od /W3 /Zi
+!ENDIF
+
+LDFLAGS	= /NOLOGO
+
+LIBS    = ws2_32.lib
+
+###############################################################################
+# target
+###############################################################################
+TGT	= ${S}(TGT_LIB_A)  ${S}(TGT_LIB_SO) ${S}(TGT_UNIT_TEST)
+
+OBJS	= ${S}(OBJS_LIB) ${S}(OBJS_UNIT_TEST)
+
+all: ${S}(TGT)
+
+${S}(TGT_LIB_A): ${S}(OBJS_LIB)
+	${S}(AR) ${S}(OBJS_LIB) ${S}(LIBS) /o:${S}(TGT_LIB_A)
+
+${S}(TGT_LIB_SO): ${S}(OBJS_LIB)
+	${S}(LD) ${S}(LDFLAGS) /Dll ${S}(OBJS_LIB) ${S}(LIBS) /o:${S}(TGT_LIB_SO)
+
+${S}(TGT_UNIT_TEST): ${S}(OBJS_UNIT_TEST)
+	${S}(CC) ${S}(TGT_LIB_A) ${S}(OBJS_UNIT_TEST) /o ${S}(TGT_UNIT_TEST)
+
+clean:
+	${S}(RM) ${S}(OBJS)
+	${S}(RM) ${S}(TGT)
+	${S}(RM) ${S}(TGT_LIB_SO)*
+!
+}
+
 autogen_readme_md()
 {
 cat > ${README_MD} <<!
@@ -233,7 +306,7 @@ output=version.h
 
 LIBNAME=\`echo \${libname} | tr 'a-z' 'A-Z'\`
 export version=\${major}.\${minor}.\${patch}
-export buildid=\`git log -1 --pretty=format:"git-%cd-%h" --date=short .\`
+export buildid=\`git log -1 --pretty=format:"git-%cd-%h" --date=short 2>/dev/null\`
 autogen_version_h()
 {
 cat > version.h <<!
@@ -268,6 +341,7 @@ autogen_libfoo_c
 autogen_libfoo_h
 autogen_test_libfoo_c
 autogen_makefile
+autogen_makefile_nmake
 autogen_version_sh
 autogen_android_mk
 autogen_readme_md

libbase64/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libbase64
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libbase64/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -92,13 +99,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libbase64/Makefile.nmake

@@ -21,7 +21,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /Iinclude /I../libposix4win/ /I. 
-CFLAGS	= $(CFLAGS) /Od /W3 /Zi
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Od /W3 /Zi
+!ENDIF
 
 LDFLAGS	= /LIBPATH:../libposix4win/ /LIBPATH:./
 

libbase64/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short 2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libconfig/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libconfig
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O0
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libconfig/Makefile

@@ -23,6 +23,7 @@ endif
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -70,7 +71,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O0 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include -I./
 ifeq ($(ENABLE_LUA), 1)
@@ -81,7 +88,7 @@ endif
 SHARED	:= -shared
 
 LDFLAGS	:= $($(ARCH)_LDFLAGS)
-LDFLAGS += -L$(OUTPUT)/lib -lmacro
+LDFLAGS += -L$(OUTPUT)/$(LTYPE)/lib -lmacro
 ifeq ($(ENABLE_LUA), 1)
 LDFLAGS	+= `pkg-config --libs lua5.2`
 endif
@@ -126,13 +133,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libconfig/Makefile.nmake

@@ -26,7 +26,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /Iinclude /I../libposix4win/ /I../libmacro/ /I.
-CFLAGS	= $(CFLAGS) /Od /W3 /Zi
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /Od /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Od /W3 /Zi
+!ENDIF
 
 LDFLAGS	= /LIBPATH:../libposix4win/ /LIBPATH:../libmacro/ /LIBPATH:./
 

libconfig/libconfig++/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libconfig++
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libconfig/libconfig++/Makefile

@@ -25,6 +25,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -68,7 +69,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 CFLAGS_LUA	= `pkg-config --cflags lua5.3`
 CFLAGS_JSON	= `pkg-config --cflags jsoncpp`
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 CFLAGS	+= $(CFLAGS_LUA)
@@ -79,7 +86,7 @@ SHARED	:= -shared
 LDFLAGS_LUA	= `pkg-config --libs lua5.3`
 LDFLAGS_JSON	= `pkg-config --libs jsoncpp`
 LDFLAGS	:= $($(ARCH)_LDFLAGS)
-LDFLAGS += -L$(OUTPUT)/lib -llog
+LDFLAGS += -L$(OUTPUT)/$(LTYPE)/lib -llog
 LDFLAGS	+= -lpthread
 LDFLAGS	+= $(LDFLAGS_LUA)
 LDFLAGS	+= $(LDFLAGS_JSON)
@@ -126,14 +133,15 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	mkdir -p $(OUTPUT)/include/libgconfig
 	$(CP_V) -dpRf --parents $(TGT_LIB_H)  $(OUTPUT)/include/libgconfig
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/libgconfig/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/libgconfig/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libconfig/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short 2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libdebug/Android.mk

@@ -4,6 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libdebug
 
+LOCAL_CFLAGS += -g
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libdebug/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
 CFLAGS	:= -g -rdynamic -Wall -Werror -fPIC
+LTYPE   := release
+else
+CFLAGS	:= -g -rdynamic -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -93,12 +100,12 @@ clean:
 install:
 	$(MAKEDIR_OUTPUT)
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libdebug/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libdict/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libdict
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libdict/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -92,13 +99,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libdict/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libfile/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libfile
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libfile/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -55,7 +56,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 ifeq ($(ENABLE_FILEWATCHER), 1)
@@ -67,7 +74,7 @@ SHARED	:= -shared
 LDFLAGS	:= $($(ARCH)_LDFLAGS)
 LDFLAGS	+= -pthread
 ifeq ($(ENABLE_FILEWATCHER), 1)
-LDFLAGS	+= -L$(OUTPUT)/lib -ldict -lgevent
+LDFLAGS	+= -L$(OUTPUT)/$(LTYPE)/lib -ldict -lgevent
 endif
 
 ###############################################################################
@@ -106,13 +113,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libfile/Makefile.nmake

@@ -21,7 +21,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /Iinclude /I../libposix4win/ /I.
-CFLAGS	= $(CFLAGS) /Od /W3 /Zi
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Od /W3 /Zi
+!ENDIF
 
 LDFLAGS	= /LIBPATH:../libposix4win/ /LIBPATH:./
 

libfile/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libgevent/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libgevent
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O0
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libgevent/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -48,7 +49,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O0 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -93,13 +100,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libgevent/Makefile.nmake

@@ -21,7 +21,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /Iinclude /I../libposix4win/ /I. 
-CFLAGS	= $(CFLAGS) /Od /W3 /Zi
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /Od /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Od /W3 /Zi
+!ENDIF
 
 LDFLAGS	= /LIBPATH:../libposix4win/ /LIBPATH:./
 

libgevent/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libhal/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libhal
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libhal/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -92,13 +99,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libhal/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libhash/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libhash
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libhash/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -92,13 +99,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libhash/Makefile.nmake

@@ -21,8 +21,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /IWIN32-Code /IWIN32-Code/nmake /Iinclude /I. /I../libmacro/
-CFLAGS	= $(CFLAGS) /Ox /W3
-
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Ox /W3
+!ENDIF
 
 LDFLAGS	= -pthread -ldl
 

libhash/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libipc/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libipc
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O0
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libipc/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -51,7 +52,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
-EXTRA_CFLAGS	:= -g -Wall -Werror
+ifeq ($(MODE), release)
+EXTRA_CFLAGS	:= -O0 -Wall -Werror 
+LTYPE   := release
+else
+EXTRA_CFLAGS	:= -g -Wall -Werror 
+LTYPE   := debug
+endif
 ifneq ($(driver), y)
 EXTRA_CFLAGS	+= -fPIC
 endif
@@ -62,7 +69,7 @@ EXTRA_CFLAGS	+= -I../libmacro/
 SHARED	:= -shared
 
 EXTRA_LDFLAGS	:= $($(ARCH)_LDFLAGS)
-EXTRA_LDFLAGS	+= -L$(OUTPUT)/lib -ldict -lgevent
+EXTRA_LDFLAGS	+= -L$(OUTPUT)/$(LTYPE)/lib -ldict -lgevent
 EXTRA_LDFLAGS	+= -pthread -lrt
 
 
@@ -123,17 +130,18 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 driver_install:
 	$(MAKE) -C $(KERNEL_DIR) M=$(shell pwd) modules_install
 
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libipc/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libjpeg-ex/Makefile

@@ -12,6 +12,7 @@ CC	= ${CROSS_PREFIX}gcc
 CXX	= ${CROSS_PREFIX}g++
 LD	= ${CROSS_PREFIX}ld
 AR	= ${CROSS_PREFIX}ar
+STRIP   = ${CROSS_PREFIX}strip
 
 COLOR	= 1
 CC_V	= $(CC_$(COLOR))
@@ -49,13 +50,18 @@ ifeq ($(ARCH), pi)
 OBJS_LIB	+= chrome_convert.o
 endif
 OBJS_UNIT_TEST	= test_${LIBNAME}.o
-
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= -I$(OUTPUT)/include
 SHARED	:= -shared
 LDFLAGS	:= -lpthread
 LDFLAGS	+= -ljpeg
-LDFLAGS	+= -L$(OUTPUT)/lib
+LDFLAGS	+= -L$(OUTPUT)/$(LTYPE)/lib
 LDFLAGS	+= -llog
 
 .PHONY : all clean
@@ -85,11 +91,12 @@ clean:
 	$(RM_V) -f $(TGT)
 
 install:
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  ${OUTPUT}/include
-	$(CP_V) -r $(TGT_LIB_A)  ${OUTPUT}/lib
-	$(CP_V) -r $(TGT_LIB_SO) ${OUTPUT}/lib
+	$(CP_V) -r $(TGT_LIB_A)  ${OUTPUT}/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) ${OUTPUT}/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f ${OUTPUT}/include/$(TGT_LIB_H)
-	$(RM_V) -f ${OUTPUT}/lib/$(TGT_LIB_A)
-	$(RM_V) -f ${OUTPUT}/lib/$(TGT_LIB_SO)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f ${OUTPUT}/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f ${OUTPUT}/$(LTYPE)/lib/$(TGT_LIB_SO)

libjpeg-ex/Makefile.android

@@ -14,10 +14,16 @@ LIBNAME	= libfoo
 CC	= $(TOOLCHAINS_PREFIX)-gcc
 LD	= $(TOOLCHAINS_PREFIX)-ld
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+else
+LOCAL_CFLAGS += -g
+endif
+
 INC_PATH = -I$(TOOLCHAINS_INCLUDE) \
 		   -I$(TOOLCHAINS_INCLUDE_FIXED) \
 		   -I$(PLATFORM_INCLUDE)
-CFLAGS	:= $(INC_PATH) -g -Wall \
+CFLAGS	:= $(INC_PATH) $(LOCAL_CFLAGS) -Wall \
 	   -D__ANDROID_APP__ \
 	   -fno-exceptions \
 	   -fno-unwind-tables \

liblog/Android.mk

@@ -5,6 +5,10 @@ include $(CLEAR_VARS)
 # because liblog is used by android default, so change to libglog
 LOCAL_MODULE := libglog
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

liblog/Makefile

@@ -35,6 +35,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -65,7 +66,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
-CFLAGS	:= -g -Wall -Werror
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror 
+LTYPE   := release
+else
+CFLAGS	:= -g -Wall -Werror 
+LTYPE   := debug
+endif
 ifeq ($(ARCH), win)
 else
 CFLAGS	+= -fPIC
@@ -117,13 +124,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

liblog/Makefile.nmake

@@ -21,7 +21,12 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /Iinclude /I../libposix4win/ /I. 
-CFLAGS	= $(CFLAGS) /Od /W3 /Zi
+
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Od /W3 /Zi
+!ENDIF
 
 LDFLAGS	= /LIBPATH:../libposix4win/ /LIBPATH:./
 

liblog/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libmacro/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmacro
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libmacro/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -48,7 +49,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -93,13 +100,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)

libmacro/Makefile.nmake

@@ -21,7 +21,11 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).obj
 # cflags and ldflags
 ###############################################################################
 CFLAGS	= /IWIN32-Code /IWIN32-Code/nmake /Iinclude /I.
-CFLAGS	= $(CFLAGS) /Ox /W3
+!IF "$(MODE)"=="release"
+CFLAGS  = $(CFLAGS) /O2 /GF
+!ELSE
+CFLAGS  = $(CFLAGS) /Ox /W3
+!ENDIF
 
 
 ###############################################################################

libmacro/version.sh

@@ -8,7 +8,7 @@ output=version.h
 
 LIBNAME=`echo ${libname} | tr 'a-z' 'A-Z'`
 export version=${major}.${minor}.${patch}
-export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short .`
+export buildid=`git log -1 --pretty=format:"git-%cd-%h" --date=short  2>/dev/null`
 autogen_version_h()
 {
 cat > version.h <<!

libmp4parser/Android.mk

@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmp4parser
 
+ifeq ($(MODE), release)
+LOCAL_CFLAGS += -O2
+endif
+
 LIBRARIES_DIR	:= $(LOCAL_PATH)/../
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

libmp4parser/Makefile

@@ -17,6 +17,7 @@ CC	= $(CROSS_PREFIX)gcc
 CXX	= $(CROSS_PREFIX)g++
 LD	= $(CROSS_PREFIX)ld
 AR	= $(CROSS_PREFIX)ar
+STRIP   = $(CROSS_PREFIX)strip
 
 ifeq ($(COLOR_INC), $(wildcard $(COLOR_INC)))
 include $(COLOR_INC)
@@ -47,7 +48,13 @@ OBJS_UNIT_TEST	= test_$(LIBNAME).o
 ###############################################################################
 # cflags and ldflags
 ###############################################################################
+ifeq ($(MODE), release)
+CFLAGS	:= -O2 -Wall -Werror -fPIC
+LTYPE   := release
+else
 CFLAGS	:= -g -Wall -Werror -fPIC
+LTYPE   := debug
+endif
 CFLAGS	+= $($(ARCH)_CFLAGS)
 CFLAGS	+= -I$(OUTPUT)/include
 
@@ -92,13 +99,14 @@ clean:
 
 install:
 	$(MAKEDIR_OUTPUT)
+	if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
 	$(CP_V) -r $(TGT_LIB_H)  $(OUTPUT)/include
-	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/lib
-	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/lib
+	$(CP_V) -r $(TGT_LIB_A)  $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO) $(OUTPUT)/$(LTYPE)/lib
+	$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTPUT)/$(LTYPE)/lib
 
 uninstall:
-	$(RM_V) -f $(OUTPUT)/include/$(TGT_LIB_H)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_A)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO)
-	$(RM_V) -f $(OUTPUT)/lib/$(TGT_LIB_SO_VER)
+	cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_A)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO)
+	$(RM_V) -f $(OUTPUT)/$(LTYPE)/lib/$(TGT_LIB_SO_VER)