Changeset 4704 for pjproject/trunk/pjsip/build/Makefile
- Timestamp:
- Jan 16, 2014 5:30:46 AM (11 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/projects/pjsua2 (added) merged: 4595,4597-4598,4600,4608,4619,4631,4638-4640,4642-4648,4654-4655,4657-4660,4662-4666,4668-4687,4689-4693,4696-4699,4702
- Property svn:mergeinfo changed
-
pjproject/trunk/pjsip/build/Makefile
r4656 r4704 22 22 export PJSIP_SIMPLE_LIB:=libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 23 23 export PJSUA_LIB_LIB:=libpjsua-$(TARGET_NAME)$(LIBEXT) 24 export PJSUA2_LIB_LIB=../lib/libpjsua2-$(TARGET_NAME)$(LIBEXT) 24 25 25 26 ifeq ($(PJ_SHARED_LIBRARIES),) … … 33 34 export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX) 34 35 export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR) 36 export PJSUA2_LIB_SONAME := ../lib/libpjsua2.$(SHLIB_SUFFIX) 37 export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR) 35 38 endif 36 39 … … 129 132 130 133 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 134 135 ############################################################################### 136 # Defines for building pjsua2 library 137 # 138 export PJSUA2_LIB_SRCDIR = ../src/pjsua2 139 export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 140 account.o endpoint.o json.o persistent.o types.o \ 141 siptypes.o call.o presence.o media.o 142 export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 143 export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 144 145 146 ############################################################################### 147 # Defines for building pjsua2-test application 148 # 149 export PJSUA2_TEST_SRCDIR = ../src/pjsua2-test 150 export PJSUA2_TEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 151 main.o 152 export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 153 export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 154 export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) -lstdc++ $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 155 export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 156 157 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 158 131 159 132 160 ############################################################################### … … 167 195 $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) \ 168 196 $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) \ 169 $(TEST_EXE) 197 $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME) \ 198 $(TEST_EXE) \ 199 $(PJSUA2_TEST_EXE) 170 200 171 201 all: $(TARGETS) … … 191 221 .PHONY: $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) 192 222 .PHONY: $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) 223 .PHONY: $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME) 193 224 .PHONY: $(TEST_EXE) 225 .PHONY: $(PJSUA2_TEST_EXE) 194 226 195 227 pjsip: $(PJSIP_LIB) … … 221 253 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 222 254 255 pjsua2-test: $(PJSUA2_TEST_EXE) 256 $(PJSUA2_TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME) 257 $(PJSUA2_TEST_EXE): $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) 258 $(PJSUA2_TEST_EXE): $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) 259 $(PJSUA2_TEST_EXE): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) 260 $(PJSUA2_TEST_EXE): $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME) 261 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 262 223 263 .PHONY: pjsip.ko 224 264 pjsip.ko: … … 240 280 echo Making $@ 241 281 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 282 283 .PHONY: pjsua2-lib.ko 284 pjsua2-lib.ko: 285 echo Making $@ 286 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 242 287 243 288 clean: … … 246 291 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 247 292 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 293 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 248 294 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 295 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 249 296 250 297 depend: … … 253 300 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 254 301 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 302 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 255 303 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 304 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 256 305 echo '$(BINDIR)/$(TEST_EXE): $(PJMEDIA_LIB) $(LIBDIR)/$(PJSUA_LIB_LIB) $(LIBDIR)/$(PJSIP_SIMPLE_LIB) $(LIBDIR)/$(PJSIP_UA_LIB) $(LIBDIR)/$(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend 306 echo '$(BINDIR)/$(PJSUA2_TEST_EXE): $(PJSUA2_LIB_LIB) $(PJMEDIA_LIB) $(LIBDIR)/$(PJSUA_LIB_LIB) $(LIBDIR)/$(PJSIP_SIMPLE_LIB) $(LIBDIR)/$(PJSIP_UA_LIB) $(LIBDIR)/$(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsua2-test-$(TARGET_NAME).depend 257 307 258 308 realclean: … … 261 311 $(subst @@,$(subst /,$(HOST_PSEP),.pjsip-simple-$(TARGET_NAME).depend),$(HOST_RMR)) 262 312 $(subst @@,$(subst /,$(HOST_PSEP),.pjsua-lib-$(TARGET_NAME).depend),$(HOST_RMR)) 313 $(subst @@,$(subst /,$(HOST_PSEP),.pjsua2-lib-$(TARGET_NAME).depend),$(HOST_RMR)) 314 $(subst @@,$(subst /,$(HOST_PSEP),.pjsua2-test-$(TARGET_NAME).depend),$(HOST_RMR)) 263 315 $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ 264 316 $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ … … 266 318 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 267 319 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 268 269 270 320 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $@ 321 $(MAKE) -f $(RULES_MAK) APP=PJSUA2_TEST app=pjsua2-test $@ 322 323 324
Note: See TracChangeset
for help on using the changeset viewer.