summaryrefslogtreecommitdiff
path: root/pjsip-apps/build/Makefile
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2014-02-20 08:08:06 +0000
committerNanang Izzuddin <nanang@teluu.com>2014-02-20 08:08:06 +0000
commitffa460e4438968b000f4011b62b2229087aff4ce (patch)
tree567d6d2686fe3df7883134ea3f0c092dd69c2231 /pjsip-apps/build/Makefile
parent6442fe1b398f50fb2323cbdd604dba0aa9ab2557 (diff)
Re #1519: Include user.mak build settings in building pjsua app and pjsua2 SWIG Python binding.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4753 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/build/Makefile')
-rw-r--r--pjsip-apps/build/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
index 02835d7e..917b1deb 100644
--- a/pjsip-apps/build/Makefile
+++ b/pjsip-apps/build/Makefile
@@ -39,9 +39,9 @@ export PJSUA_SRCDIR = ../src/pjsua
export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \
pjsua_app_config.o pjsua_app_legacy.o
-export PJSUA_CFLAGS += $(PJ_CFLAGS)
-export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS)
-export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS)
+export PJSUA_CFLAGS += $(PJ_CFLAGS) $(CFLAGS)
+export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS) $(CFLAGS)
+export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE)
@@ -51,9 +51,9 @@ export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE)
export PJSYSTEST_SRCDIR = ../src/pjsystest
export PJSYSTEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
systest.o main_console.o
-export PJSYSTEST_CFLAGS += $(PJ_CFLAGS)
-export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS)
-export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS)
+export PJSYSTEST_CFLAGS += $(PJ_CFLAGS) $(CFLAGS)
+export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS) $(CFLAGS)
+export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE)