Fixed build system for third_party
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1201 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index 66113fd..edc69d1 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -1,44 +1,13 @@
include ../../build/common.mak
-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
-PJNATH_LIB:=../../pjnath/lib/libpjnath-$(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)../../pjnath/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_CODEC_LIB)) \
- $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
- $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
- $(subst /,$(HOST_PSEP),$(PJNATH_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 := $(PJ_CFLAGS)
+export _CXXFLAGS:= $(PJ_CXXFLAGS)
+export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS)
SRCDIR := ../src/samples
OBJDIR := ./output/samples-$(TARGET_NAME)