Updated the footprint generation script to include PJNATH

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1352 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 16 insertions, 34 deletions

diff --git a/pjsip-apps/build/Footprint.mak b/pjsip-apps/build/Footprint.mak
index 9510d54b..cc63179d 100644
--- a/pjsip-apps/build/Footprint.mak
+++ b/pjsip-apps/build/Footprint.mak
@@ -2,49 +2,22 @@
 # This file is used by get-footprint.py script to build samples/footprint.c
 # to get the footprint report for PJSIP/PJMEDIA.
 #
+include ../../build.mak
 include ../../build/common.mak
 
-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
-PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)
-PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
-PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT)
-PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT)
-PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT)
-PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)
-
 
 ###############################################################################
 # Gather all flags.
 #
-export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
-		   $(CFLAGS) $(CC_INC)../../pjsip/include \
-		   $(CC_INC)../../pjlib/include \
-		   $(CC_INC)../../pjlib-util/include \
-		   $(CC_INC)../../pjmedia/include
-export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
-		   $(HOST_CXXFLAGS) $(CXXFLAGS)
-
-export LIBS :=	$(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
-		$(subst /,$(HOST_PSEP),$(PJLIB_LIB))
-
-
-export _LDFLAGS := $(LIBS) \
-		   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
-		   $(LDFLAGS) -lm
-
+export _CFLAGS 	:= $(APP_CFLAGS) $(CFLAGS)
+export _CXXFLAGS:= $(_CFLAGS)
 
+export _LDFLAGS := $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
 
 EXE := footprint.exe
 
 all: 
-	$(CROSS_COMPILE)$(CC_NAME) -o $(EXE) ../src/samples/footprint.c $(FCFLAGS) $(_CFLAGS) $(_LDFLAGS)
+	$(APP_CC) -o $(EXE) ../src/samples/footprint.c $(FCFLAGS) $(_CFLAGS) $(_LDFLAGS)
 	$(CROSS_COMPILE)strip --strip-all $(EXE)
 
 clean:
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index edc69d17..bf0b451c 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -5,9 +5,9 @@ include ../../build/common.mak
 ###############################################################################
 # Gather all flags.
 #
-export _CFLAGS 	:= $(PJ_CFLAGS)
+export _CFLAGS 	:= $(PJ_CFLAGS) $(CFLAGS)
 export _CXXFLAGS:= $(PJ_CXXFLAGS)
-export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS)
+export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
 
 SRCDIR := ../src/samples
 OBJDIR := ./output/samples-$(TARGET_NAME)
diff --git a/pjsip-apps/build/get-footprint.py b/pjsip-apps/build/get-footprint.py
index c20c8978..cb6f6868 100644
--- a/pjsip-apps/build/get-footprint.py
+++ b/pjsip-apps/build/get-footprint.py
@@ -44,6 +44,9 @@ compile_flags = [
     ['HAS_PJLIB_XML',		'PJLIB-UTIL tiny XML (parsing and API) (needs text scanner)'],
     ['HAS_PJLIB_DNS',		'PJLIB-UTIL DNS packet and parsing'],
     ['HAS_PJLIB_RESOLVER',	'PJLIB-UTIL Asynchronous DNS resolver/caching engine'],
+    ['HAS_PJLIB_CRC32',		'PJLIB-UTIL CRC32 algorithm'],
+    ['HAS_PJLIB_HMAC_MD5',	'PJLIB-UTIL HMAC-MD5 algorithm'],
+    ['HAS_PJLIB_HMAC_SHA1',	'PJLIB-UTIL HMAC-SHA1 algorithm'],
 
     # PJSIP
     ['HAS_PJSIP_CORE_MSG_ELEM',	'PJSIP Core - Messaging Elements and Parsing (message, headers, SIP URI, TEL URI/RFC 3966, etc.)'],
@@ -53,6 +56,7 @@ compile_flags = [
     ['',			'Subtotal: A minimalistic SIP application (parsing, UDP transport+STUN, no transaction)'],
    
     ['HAS_PJSIP_TCP_TRANSPORT',	'PJSIP TCP transport'],
+    ['HAS_PJSIP_TLS_TRANSPORT',	'PJSIP TLS transport'],
     ['HAS_PJSIP_INFO',		'PJSIP INFO support (RFC 2976) (no special treatment, thus the zero size)'],
     ['HAS_PJSIP_TRANSACTION',	'PJSIP transaction and stateful API'],
     ['HAS_PJSIP_AUTH_CLIENT',	'PJSIP digest authentication client'],
@@ -75,6 +79,10 @@ compile_flags = [
     # Subtotal
     ['',			'Subtotal: Complete PJSIP package (call, registration, presence, IM) +STUN +GETOPT (+PJLIB), no media'],
     
+    # PJNATH
+    ['HAS_PJNATH_STUN',		'PJNATH STUN'],
+    ['HAS_PJNATH_ICE',		'PJNATH ICE'],
+
     # PJMEDIA
     ['HAS_PJMEDIA_EC',		'PJMEDIA accoustic echo cancellation'],
     ['HAS_PJMEDIA_SND_DEV',	'PJMEDIA sound device backend (platform specific)'],
@@ -96,6 +104,7 @@ compile_flags = [
     ['HAS_PJMEDIA_FILE_CAPTURE',	'PJMEDIA WAV file writer'],
     ['HAS_PJMEDIA_MEM_PLAYER',	'PJMEDIA fixed buffer player'],
     ['HAS_PJMEDIA_MEM_CAPTURE',	'PJMEDIA fixed buffer writer'],
+    ['HAS_PJMEDIA_ICE',		'PJMEDIA ICE transport'],
 
     # Subtotal
     ['',			'Subtotal: Complete SIP and all PJMEDIA features (G.711 codec only)'],