Changeset 1201 for pjproject/branches/split-3rd-party/pjsip/build/Makefile

Timestamp:

Apr 17, 2007 4:16:01 PM (17 years ago)

Author:

bennylp

Message:

Fixed build system for third_party

File:

• pjproject/branches/split-3rd-party/pjsip/build/Makefile (modified) (3 diffs)

pjproject/branches/split-3rd-party/pjsip/build/Makefile

@@ -4 +4 @@
 export TEST_OBJS = main.o
 
-include ../../build/common.mak
+include ../../build.mak
+include $(PJDIR)/build/common.mak
 
-RULES_MAK := ../../build/rules.mak
+RULES_MAK := $(PJDIR)/build/rules.mak
 
 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
@@ -30 +31 @@
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(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_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
-                   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
-                   $(LDFLAGS)
-
 
 ###############################################################################
@@ -100 +90 @@
                     tsx_uas_test.o txdata_test.o uri_test.o
 export TEST_CFLAGS += $(_CFLAGS)
-export TEST_LDFLAGS += $(_LDFLAGS)
+export TEST_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS)
 export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE)