diff options
| author | Benny Prijono <bennylp@teluu.com> | 2014-02-05 05:52:10 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2014-02-05 05:52:10 +0000 |
| commit | 5fc7cd3a0bc843f1c225fb5d120d4c16cd9e114d (patch) | |
| tree | 802907ffe5c606ec4f2c7ea56cdfdec021769f37 /pjsip-apps | |
| parent | fb57fd0035e2b3409bfe14cf130c20591d7768c9 (diff) | |
Re #1516: fixing multiple inclusions of crtbegin.o and -lgcc in the makefiles. The former causes link errors due to multiple symbols
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4732 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/build/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index 62471e57..02835d7e 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 += $(_CFLAGS) -export PJSUA_CXXFLAGS += $(_CXXFLAGS) -export PJSUA_LDFLAGS += $(_LDFLAGS) +export PJSUA_CFLAGS += $(PJ_CFLAGS) +export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS) +export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) 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 += $(_CFLAGS) -export PJSYSTEST_CXXFLAGS += $(_CXXFLAGS) -export PJSYSTEST_LDFLAGS += $(_LDFLAGS) +export PJSYSTEST_CFLAGS += $(PJ_CFLAGS) +export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS) +export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) |