Changeset 241 for pjproject/trunk/pjsip/build

Timestamp:

Feb 27, 2006 12:40:31 AM (19 years ago)

Author:

bennylp

Message:

Updated mingw compilation

File:

• pjproject/trunk/pjsip/build/Makefile (modified) (9 diffs)

pjproject/trunk/pjsip/build/Makefile

@@ -11 +11 @@
 export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
+export PJSUA_LIB_LIB=../lib/libpjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
 
 
@@ -21 +22 @@
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
+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)) \
@@ -50 +52 @@
 export PJSIP_UA_SRCDIR = ../src/pjsip-ua
 export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        sip_inv.o sip_reg.o
+                        sip_inv.o sip_reg.o sip_xfer.o
 export PJSIP_UA_CFLAGS += $(_CFLAGS)
 
@@ -64 +66 @@
 
 ###############################################################################
+# Defines for building PJSUA-LIB library
+#
+export PJSUA_LIB_SRCDIR = ../src/pjsua-lib
+export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+                        pjsua_reg.o pjsua_call.o pjsua_pres.o pjsua_opt.o \
+                        pjsua_core.o
+export PJSUA_LIB_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
 # Defines for building PJSUA
 #
 export PJSUA_SRCDIR = ../src/pjsua
 export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        main.o pjsua_reg.o pjsua_inv.o pjsua_pres.o pjsua_opt.o \
-                        pjsua_core.o
+                        main.o 
 export PJSUA_CFLAGS += $(_CFLAGS)
 export PJSUA_LDFLAGS += $(_LDFLAGS)
@@ -81 +92 @@
 #
 #
-TARGETS := pjsip pjsip-ua pjsip-simple pjsua
+TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsua
 
 all: $(TARGETS)
@@ -91 +102 @@
 distclean: realclean
 
-.PHONY: dep depend pjsip pjsip-ua pjsua clean realclean distclean
+.PHONY: dep depend pjsip pjsip-ua pjsua-lib pjsua clean realclean distclean
 
 pjsip:
@@ -102 +113 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB)
 
-pjsua: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB)
+pjsua-lib:
+        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
+
+pjsua: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB)
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
 
@@ -120 +134 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
 
+.PHONY: ../lib/pjsua-lib.ko
+../lib/pjsua-lib.ko:
+        echo Making $@
+        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@
+
 .PHONY: ../lib/pjsua.ko
 ../lib/pjsua.ko:
@@ -128 +147 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
         $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@
+        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
         @if test "$@" == "depend"; then \
-          echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB)' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
+          echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB)' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
         fi