-merged b-recon-20080504 with main - summary:

  - added the new reflow and recon projects
  - changes to configure to support new projects and
    ask if repro should be built or not
  - updated ASIO to 1.0.0
  - added VS2005 project files and solutions for reTurn
  - moved/merged dtls_wrapper project into reflow


git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@7729 ddefafc4-47db-0310-ae44-fa13212b10f2

Makefile

@@ -7,9 +7,33 @@ BUILD 	=	build
 -include $(BUILD)/Makefile.tools
 -include $(BUILD)/Makefile.osarch
 
-stack: repro dum tests
+DEFAULTS :=
+ifeq ($(BUILD_RECON), yes)
+DEFAULTS += dtls-srtp-openssl
+endif
+DEFAULTS += stack
+ifeq ($(BUILD_REPRO),yes)
+DEFAULTS += repro
+endif
+ifeq ($(BUILD_RECON),yes)
+DEFAULTS += recon
+endif
+ifeq ($(BUILD_RETURN_CLIENT),yes)
+DEFAULTS += return-client
+endif
+ifeq ($(BUILD_RETURN_SERVER),yes)
+DEFAULTS += return-server
+endif
+ifeq ($(BUILD_TFM),yes)
+DEFAULTS += tfm
+endif
+
+default: $(DEFAULTS)
+#default: repro dum tests
 
-all: repro dum tests tfm apps
+stack: dum tests
+
+all: repro dum tests tfm apps recon
 
 tfm: tfmcontrib
 	cd tfm; $(MAKE)
@@ -42,12 +66,27 @@ presSvr: resiprocate
 
 apps: dum
 	cd apps; $(MAKE)
+
+return: return-server return-client
+
+reTurn: return
+
+reTURN: return
 
-reTurn: rutil
+return-server: rutil
 	cd reTurn; $(MAKE)
+
+return-client: rutil
 	cd reTurn/client; $(MAKE)
 	cd reTurn/client/test; $(MAKE)
 
+recon: dum reflow
+	cd resip/recon; $(MAKE)
+	cd resip/recon/test; $(MAKE)
+
+reflow: dtls-srtp-openssl return-client srtp 
+	cd reflow; $(MAKE)
+
 ifeq (${BUILD_SHARED_LIBS},no)
    NETXX_USE_SHARED_LIBS=--disable-shared
    CPPUNIT_USE_SHARED_LIBS=--enable-shared=false
@@ -102,13 +141,21 @@ configure_ares: contrib/ares-build.$(OS_ARCH)/Makefile
 ares: configure_ares
 	cd contrib/ares-build.$(OS_ARCH) && $(MAKE)
 
-contrib/dtls/Makefile:
-	cd contrib/dtls && ./config
+contrib/srtp/Makefile:
+	cd contrib/srtp && ./configure ${CONFIGURE_ARGS}
+
+configure_srtp: contrib/srtp/Makefile
+
+srtp: configure_srtp
+	cd contrib/srtp && $(MAKE)
+
+contrib/openssl/Makefile:
+	cd $(SSL_LOCATION) && ./Configure linux-generic32 --openssldir=/usr enable-tlsext ${CONFIGURE_ARGS} && $(MAKE) depend
 
-configure_dtls: contrib/dtls/Makefile
+configure_dtls-srtp-openssl: contrib/openssl/Makefile
 
-dtls: configure_dtls
-	cd contrib/dtls && $(MAKE)
+dtls-srtp-openssl: configure_dtls-srtp-openssl
+	cd $(SSL_LOCATION) && $(MAKE)
 
 tfmcontrib: cppunit netxx
 
@@ -227,7 +274,7 @@ cleanpkg:
 $(BUILD)/Makefile.conf:
 	./configure -y
 
-.PHONY: resiprocate tests contrib ares dtls
+.PHONY: resiprocate tests contrib ares srtp dtls-srtp-openssl
 .PHONY: install install-ares install-rutil install-resip install-repro install-dum
 .PHONY: SVN-VERSION repro-rpm repro-dist cleanpkg rpmbuild-area
 .PHONY: repro dum tests tfm tfmcontrib contrib rutil check presSvr

build/Makefile.pkg

@@ -49,6 +49,7 @@ ifeq ($(USE_SSL),yes)
 
   ifneq ($(SSL_LOCATION),)
     OPENSSL_LIBNAME :=
+    OPENSSL_LDFLAGS := -ldl
     OPENSSL_INCLUDEDIRS := $(SSL_LOCATION)/include
     OPENSSL_LDLIBS_LAST := $(SSL_LOCATION)/libssl.a
     OPENSSL_LDLIBS_LAST += $(SSL_LOCATION)/libcrypto.a
@@ -71,22 +72,8 @@ endif
 #OPENSSL_LDLIBS_LAST := /usr/local/ssl/lib/libssl.a /usr/local/ssl/lib/libcrypto.a
 #OPENSSL_INCLUDEDIRS := /usr/local/ssl/include
 
-ifeq ($(USE_DTLS),yes)
-DTLS_WRAPPER_INCLUDEDIRS := $(ROOT)/dtls_wrapper
-DTLS_WRAPPER_LIBDIRS := $(ROOT)/dtls_wrapper/obj.$(TARGET_NAME)
-DTLS_WRAPPER_LIBNAME := dtls_wrapper
-
-DTLS_WRAPPER_DEPENDS := $(ROOT)/dtls_wrapper/obj.$(TARGET_NAME)/libdtls_wrapper.$(LIBSUFFIX)
-$(DTLS_WRAPPER_DEPENDS): 
-	cd $(ROOT)/dtls_wrapper; $(MAKE)
-
-OPENSSL_INCLUDEDIRS := $(ROOT)/../contrib/dtls-srtp/openssl/include
-OPENSSL_LIBDIRS := $(ROOT)/../contrib/dtls-srtp/openssl
-OPENSSL_LIBNAME = ssl crypto dl
-endif
-
-SRTP_INCLUDEDIRS := $(ROOT)/../contrib/dtls-srtp/srtp/include $(ROOT)/../contrib/dtls-srtp/srtp/crypto/include/
-SRTP_LIBDIRS := $(ROOT)/../contrib/dtls-srtp/srtp/
+SRTP_INCLUDEDIRS := $(ROOT)/contrib/srtp/include $(ROOT)/contrib/srtp/crypto/include/
+SRTP_LIBDIRS := $(ROOT)/contrib/srtp/
 SRTP_LIBNAME := srtp
 
 ifeq ($(USE_MYSQL),yes)
@@ -206,6 +193,27 @@ TFM_DEPENDS := $(ROOT)/tfm/obj.$(TARGET_NAME)/libtfm.$(LIBSUFFIX)
 $(TFM_DEPENDS): 
 	cd $(ROOT)/tfm; $(MAKE) 
 
+RETURNCLIENT_INCLUDEDIRS := $(ROOT)/reTurn
+RETURNCLIENT_LIBDIRS := $(ROOT)/reTurn/client/obj.$(TARGET_NAME)
+RETURNCLIENT_LIBNAME := reTurnClient
+RETURNCLIENT_DEPENDS := $(ROOT)/reTurn/client/obj.$(TARGET_NAME)/libreTurnClient.$(LIBSUFFIX)
+$(RETURNCLIENT_DEPENDS):
+	cd $(ROOT)/reTurn/client; $(MAKE)
+
+REFLOW_INCLUDEDIRS := $(ROOT)/reflow
+REFLOW_LIBDIRS := $(ROOT)/reflow/obj.$(TARGET_NAME)
+REFLOW_LIBNAME := reflow
+REFLOW_DEPENDS := $(ROOT)/reflow/obj.$(TARGET_NAME)/libreflow.$(LIBSUFFIX)
+$(REFLOW_DEPENDS):
+	cd $(ROOT)/reflow; $(MAKE)
+
+RECON_INCLUDEDIRS := $(ROOT)/resip/recon
+RECON_LIBDIRS := $(ROOT)/resip/recon/obj.$(TARGET_NAME)
+RECON_LIBNAME := recon
+RECON_DEPENDS := $(ROOT)/resip/recon/obj.$(TARGET_NAME)/librecon.$(LIBSUFFIX)
+$(RECON_DEPENDS):
+	cd $(ROOT)/resip/recon; $(MAKE)
+
 DEFINES += USE_ARES
 ifeq ($(USE_IPV6),yes)
 DEFINES += USE_IPV6
@@ -245,14 +253,43 @@ ifeq ($(OSTYPE),MinGW)
   TFMLIBS_LDLIBS_LAST := $(MINGW_BOOST_DIR)/lib/libboost_regex-mgw-s.lib
 endif
 
-ifndef SIPXBASE
-SIPXBASE := $(ROOT)/sipX
+ifndef SIPX_ROOT
+SIPX_ROOT := ../sipXtapi
+endif
+
+ifeq ($(SIPX_INSTALLED),yes)
+
+SIPX_INCLUDEDIRS := $(SIPX_INCDIR)
+#SIPX_LIBDIRS := $(SIPX_LIBDIR)
+#SIPX_LIBNAME := sipXmediaProcessing sipXmedia sipXtack  sipXsdp sipXport
+SIPX_LDLIBS_LAST := $(SIPX_LIBDIR)/libsipXmediaProcessing.a
+SIPX_LDLIBS_LAST += $(SIPX_LIBDIR)/libsipXmedia.a
+SIPX_LDLIBS_LAST += $(SIPX_LIBDIR)/libsipXtack.a
+SIPX_LDLIBS_LAST += $(SIPX_LIBDIR)/libsipXsdp.a
+SIPX_LDLIBS_LAST += $(SIPX_LIBDIR)/libsipXport.a
+SIPX_LDLIBS_LAST += $(SIPX_LIBDIR)/libsipXmedia.a
+SIPX_LDFLAGS := -lpcre -lresolv
+SIPX_DEFINES := __pingtel_on_posix__ DEFAULT_BRIDGE_MAX_IN_OUTPUTS=10
+
+else
+
+SIPX_ROOT := $(ROOT)/$(SIPX_ROOT)
+SIPX_INCLUDEDIRS := $(SIPX_ROOT)/sipXmediaAdapterLib/sipXmediaMediaProcessing/include  $(SIPX_ROOT)/sipXmediaAdapterLib/interface  $(SIPX_ROOT)/sipXmediaLib/include $(SIPX_ROOT)/sipXtackLib/include $(SIPX_ROOT)/sipXsdpLib/include $(SIPX_ROOT)/sipXportLib/include $(SIPX_ROOT)
+#SIPX_LIBDIRS := $(SIPX_ROOT)/sipXmediaAdapterLib/sipXmediaMediaProcessing/src/.libs $(SIPX_ROOT)/sipXmediaLib/src/.libs $(SIPX_ROOT)/sipXtackLib/src/.libs $(SIPX_ROOT)/sipXsdpLib/src/.libs $(SIPX_ROOT)/sipXportLib/src/.libs
+#SIPX_LIBNAME := sipXmediaProcessing sipXmedia sipXtack  sipXsdp sipXport
+SIPX_LDLIBS_LAST := $(SIPX_ROOT)/sipXmediaAdapterLib/sipXmediaMediaProcessing/src/.libs/libsipXmediaProcessing.a
+SIPX_LDLIBS_LAST += $(SIPX_ROOT)/sipXmediaLib/src/.libs/libsipXmedia.a
+SIPX_LDLIBS_LAST += $(SIPX_ROOT)/sipXtackLib/src/.libs/libsipXtack.a
+SIPX_LDLIBS_LAST += $(SIPX_ROOT)/sipXsdpLib/src/.libs/libsipXsdp.a
+SIPX_LDLIBS_LAST += $(SIPX_ROOT)/sipXportLib/src/.libs/libsipXport.a
+SIPX_LDLIBS_LAST += $(SIPX_ROOT)/sipXmediaLib/src/.libs/libsipXmedia.a
+SIPX_LDFLAGS := -lpcre -lresolv
+SIPX_DEFINES := __pingtel_on_posix__ DEFAULT_BRIDGE_MAX_IN_OUTPUTS=10
+
 endif
 
-SIPX_INCLUDEDIRS := $(SIPXBASE)/bbridge/include $(SIPXBASE)/sipXmediaAdapterLib/sipXmediaMediaProcessing/include  $(SIPXBASE)/sipXmediaAdapterLib/interface  $(SIPXBASE)/sipXmediaLib/include $(SIPXBASE)/sipXtackLib/include $(SIPXBASE)/sipXportLib/include $(SIPXBASE)
-SIPX_LIBDIRS := $(SIPXBASE)/sipXmediaAdapterLib/sipXmediaMediaProcessing/src/.libs $(SIPXBASE)/sipXmediaLib/src/.libs $(SIPXBASE)/sipXtackLib/src/.libs $(SIPXBASE)/sipXportLib/src/.libs
-SIPX_LIBNAME := sipXmediaProcessing sipXmedia sipXtack sipXport
-SIPX_DEFINES := __pingtel_on_posix__
+BOOST_INCLUDEDIRS := $(BOOST_INCDIR_CONFIG)
+BOOST_DEFINES := BOOST_ALL_NO_LIB
 
 BOOSTSER_LIBNAME = boost_serialization boost_wserialization