* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/pjsip-apps/build/Makefile b/jni/pjproject-android/pjsip-apps/build/Makefile
index 6e5f287..71fb151 100644
--- a/jni/pjproject-android/pjsip-apps/build/Makefile
+++ b/jni/pjproject-android/pjsip-apps/build/Makefile
@@ -1,6 +1,8 @@
include ../../build.mak
include $(PJDIR)/build/common.mak
+export LIBDIR := ../lib
+export BINDIR := ../bin
RULES_MAK := $(PJDIR)/build/rules.mak
@@ -27,6 +29,8 @@
$(CC_INC)../../pjmedia/include
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
+export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+ $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
###############################################################################
# Defines for building PJSUA
@@ -36,8 +40,9 @@
main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \
pjsua_app_config.o pjsua_app_legacy.o
export PJSUA_CFLAGS += $(_CFLAGS)
-export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
-export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE)
+export PJSUA_CXXFLAGS += $(_CXXFLAGS)
+export PJSUA_LDFLAGS += $(_LDFLAGS)
+export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE)
###############################################################################
@@ -47,8 +52,9 @@
export PJSYSTEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
systest.o main_console.o
export PJSYSTEST_CFLAGS += $(_CFLAGS)
-export PJSYSTEST_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
-export PJSYSTEST_EXE:=../bin/pjsystest-$(TARGET_NAME)$(HOST_EXE)
+export PJSYSTEST_CXXFLAGS += $(_CXXFLAGS)
+export PJSYSTEST_LDFLAGS += $(_LDFLAGS)
+export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE)
export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
@@ -56,9 +62,7 @@
# Main entry
#
#
-TARGETS := pjsua pjsystest samples
-
-.PHONY: $(TARGETS)
+TARGETS := $(BINDIR)/$(PJSUA_EXE) $(BINDIR)/$(PJSYSTEST_EXE) samples
all: $(TARGETS)
@@ -67,28 +71,32 @@
dep: depend
distclean: realclean
-.PHONY: dep depend pjsua clean realclean distclean
+.PHONY: all dep depend clean realclean distclean
+.PHONY: $(TARGETS)
+.PHONY: $(PJSUA_EXE) $(PJSYSTEST_EXE)
-pjsua:
- $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
+pjsua: $(PJSUA_EXE)
+$(PJSUA_EXE):
+ $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
-pjsystest:
- $(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(PJSYSTEST_EXE)
+pjsystest: $(PJSYSTEST_EXE)
+$(PJSYSTEST_EXE):
+ $(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
samples:
$(MAKE) -f Samples.mak
-.PHONY: ../lib/pjsua.ko
-../lib/pjsua.ko:
- $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
+.PHONY: pjsua.ko
+pjsua.ko:
+ $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
clean depend realclean:
$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
$(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $@
$(MAKE) -f Samples.mak $@
@if test "$@" = "depend"; then \
- echo '$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \
- echo '$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \
+ echo '$(BINDIR)/$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \
+ echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \
fi
diff --git a/jni/pjproject-android/pjsip-apps/build/Samples.mak b/jni/pjproject-android/pjsip-apps/build/Samples.mak
index d5dd1fc..57daa8b 100644
--- a/jni/pjproject-android/pjsip-apps/build/Samples.mak
+++ b/jni/pjproject-android/pjsip-apps/build/Samples.mak
@@ -1,6 +1,8 @@
-
+include ../../build.mak
+include ../../version.mak
include ../../build/common.mak
+RULES_MAK := $(PJDIR)/build/rules.mak
###############################################################################
# Gather all flags.
@@ -16,7 +18,6 @@
SAMPLES := auddemo \
aviplay \
aectest \
- aviplay \
clidemo \
confsample \
encdec \
@@ -45,35 +46,22 @@
tonegen \
vid_streamutil
-EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE))
+EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE))
-all: $(BINDIR) $(OBJDIR) $(EXES)
+.PHONY: $(EXES)
-$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES)
- $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
- $(subst /,$(HOST_PSEP),$<) \
- $(_LDFLAGS)
+all: $(EXES)
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
- $(CC) $(_CFLAGS) \
- $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- $(subst /,$(HOST_PSEP),$<)
-
-$(OBJDIR):
- $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
-
-$(BINDIR):
- $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
+$(EXES):
+ $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
depend:
clean:
- $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
- $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
+ $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@
$(subst @@,$(EXES),$(HOST_RM))
- rm -rf $(BINDIR)
+ $(subst @@,$(BINDIR),$(HOST_RMDIR))
distclean realclean: clean
-# $(subst @@,$(subst /,$(HOST_PSEP),$(EXES)) $(subst /,$(HOST_PSEP),$(EXES)),$(HOST_RM))
-# $(subst @@,$(DEP_FILE),$(HOST_RM))
+ $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@
diff --git a/jni/pjproject-android/pjsip-apps/build/dummy.c b/jni/pjproject-android/pjsip-apps/build/dummy.c
index 5da5da3..1cb9b48 100644
--- a/jni/pjproject-android/pjsip-apps/build/dummy.c
+++ b/jni/pjproject-android/pjsip-apps/build/dummy.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: dummy.c 2660 2009-04-28 19:38:43Z nanang $ */
/**
* This is an empty C file for helping libpjproject so it gets built properly.
diff --git a/jni/pjproject-android/pjsip-apps/build/get-footprint.py b/jni/pjproject-android/pjsip-apps/build/get-footprint.py
index cb6f686..f936c0c 100644
--- a/jni/pjproject-android/pjsip-apps/build/get-footprint.py
+++ b/jni/pjproject-android/pjsip-apps/build/get-footprint.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: get-footprint.py 1352 2007-06-08 01:41:25Z bennylp $
#
# This file is used to generate PJSIP/PJMEDIA footprint report.
# To use this file, just run it in pjsip-apps/build directory, to