Changeset 4732 for pjproject/trunk/pjsip-apps/build/Makefile

Timestamp:

Feb 5, 2014 5:52:10 AM (10 years ago)

Author:

bennylp

Message:

Re #1516: fixing multiple inclusions of crtbegin.o and -lgcc in the makefiles. The former causes link errors due to multiple symbols

File:

• pjproject/trunk/pjsip-apps/build/Makefile (modified) (2 diffs)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -40 +40 @@
             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)
 
@@ -52 +52 @@
 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)