Re #1723: Fixed compilation and linking errors

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

3 files changed, 12 insertions, 11 deletions

diff --git a/build.mak.in b/build.mak.in
index 021c556b..f7f01a02 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -223,6 +223,7 @@ export PJSIP_LDLIB := -lpjsip-$(TARGET_NAME)
 export PJSIP_SIMPLE_LDLIB := -lpjsip-simple-$(TARGET_NAME)
 export PJSIP_UA_LDLIB := -lpjsip-ua-$(TARGET_NAME)
 export PJSUA_LIB_LDLIB := -lpjsua-$(TARGET_NAME)
+export PJSUA2_LIB_LDLIB := -lpjsua2-$(TARGET_NAME)
 else
 export PJLIB_LDLIB := -lpj
 export PJLIB_UTIL_LDLIB := -lpjlib-util
@@ -235,6 +236,7 @@ export PJSIP_LDLIB := -lpjsip
 export PJSIP_SIMPLE_LDLIB := -lpjsip-simple
 export PJSIP_UA_LDLIB := -lpjsip-ua
 export PJSUA_LIB_LDLIB := -lpjsua
+export PJSUA2_LIB_LDLIB := -lpjsua2
 
 APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \
 	$(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX) \
@@ -249,7 +251,8 @@ APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR
 	$(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX)
 endif
 
-export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
+export APP_LDLIBS := $(PJSUA2_LIB_LDLIB) \
+	$(PJSUA_LIB_LDLIB) \
 	$(PJSIP_UA_LDLIB) \
 	$(PJSIP_SIMPLE_LDLIB) \
 	$(PJSIP_LDLIB) \
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index 6e9ca386..65d25b9f 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -29,6 +29,7 @@ SAMPLES := auddemo \
 	   mix \
 	   pjsip-perf \
 	   pcaputil \
+	   pjsua2_demo \
 	   playfile \
 	   playsine \
 	   recfile \
@@ -48,20 +49,12 @@ SAMPLES := auddemo \
 
 EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE))
 
-PJSUA2_SAMPLES := pjsua2_demo
-
-PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE))
-
 .PHONY: $(EXES)
-.PHONY: $(PJSUA2_EXES)
 
-all: $(EXES) $(PJSUA2_EXES)
+all: $(EXES)
 
 $(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)/$@)
-
-$(PJSUA2_EXES):
-	$(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
+	$(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
 
 depend:
 
diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
index a6e474e3..6b4cd57d 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -244,6 +244,11 @@ $(PJSUA_LIB_SONAME): $(PJSUA_LIB_LIB)
 $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
 	$(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
+pjsua2-lib: $(PJSUA2_LIB_LIB)
+$(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
+	$(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
 pjsip-test: $(TEST_EXE)
 $(TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME)
 $(TEST_EXE): $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)