merge with sofia darcs trunk:

Fri Oct 12 08:42:17 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * Makefile.am: fixed ordering of SUBDIRS Fri Oct 12 13:32:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/utils/stunc.dsp: fixed include paths Fri Oct 12 13:32:19 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/tests/torture_su_root: fixed include paths Fri Oct 12 13:32:52 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32: added missing files from Makefile.am, .dsp, vproj Fri Oct 12 13:33:42 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/build_sources.cmd: added extra headers to sip_tag.c and sip_parser_table.c Fri Oct 12 13:37:00 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * win32/check.cmd: added option -a to relevant tests. Optionally check Release build. Fri Oct 12 13:37:25 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * url.h: silenced warning on URL_INIT_AS() Fri Oct 12 13:37:43 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * tstdef.h: silenced warnings on TEST_M() Fri Oct 12 13:38:15 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nta_internal.h, nua_params.c: fixed NTATAG_UDP_MTU() type Fri Oct 12 13:39:06 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * test_class.h: fixed test_auth_class, test_numeric_class declaration Fri Oct 12 13:39:51 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * Fixed various tests on win32. Fri Oct 12 13:39:58 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * sip_basic.c: removed dead code Fri Oct 12 14:38:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nea_server.c: avoid raporting un-SUBSCRIBE twice Fri Oct 12 14:38:31 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * test_sip_events.c: checking some nua_i_notifier/nua_i_subscriber events Fri Oct 12 14:38:42 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged Release candidate 2 for 1.12.7 Mon Oct 15 04:03:22 EDT 2007 Pekka.Pessi@nokia.com * configure.ac, RELEASE: version 1.12.7 Mon Oct 15 08:27:13 EDT 2007 Pekka.Pessi@nokia.com * open_c: included in the dist Tue Oct 16 08:07:46 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nua: Open C fixes Wed Oct 17 06:50:11 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * nua.docs: replace reference to nua_cli.c with sofsip_cli Wed Oct 17 08:43:11 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged rel-sofia-sip-1_12_7 Wed Oct 17 08:43:15 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> tagged 1.12.7 Wed Oct 17 11:01:12 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com> * libsofia-sip-ua/su/Makefile.am: fixed problem with automake 1.9 Wed Oct 17 11:13:15 EDT 2007 Pekka.Pessi@nokia.com * configure.ac, RELEASE: opened tree for development Tue Oct 23 10:45:17 EDT 2007 Pekka.Pessi@nokia.com * su_alloc.c: fixed su_home_init() (not initializing pointer to mutexes) Thu Oct 25 13:15:45 EDT 2007 Pekka.Pessi@nokia.com * nua_notifier.c: updated nua_i_subscribe, nua_notify() and nua_r_notify documentation Wed Nov 7 07:58:08 EST 2007 Pekka.Pessi@nokia.com * sofia-sip/htable2.h: fixed HTABLE_PROTOS2() git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6219 d0543943-73ff-0310-b7d9-9358b9ac24b2
2026-10-31 07:34:19 +00:00 · 2007-11-12 16:04:47 +00:00
1 parent 3f4fd53c97
commit 8ff118dc2c
@@ -0,0 +1,46 @@
+#
+# Makefile.am for sofia-sip/open_c
+#
+# This is used for including Open C files in dist
+#
+# Copyright (C) 2007 Nokia Corporation
+# Contact: Pekka Pessi <pekka.pessi@nokia.com>
+# Licensed under LGPL. See file COPYING.
+#
+# ref: http://www.gnu.org/software/automake/manual/automake.html
+
+EXTRA_DIST = autogen.cmd build_sources.cmd version.awk version_files.cmd
+
+EXTRA_DIST += config.h.in config.h sofia-sip/su_configure.h
+
+EXTRA_DIST += group/bld.inf
+EXTRA_DIST += group/libsofia-sip-ua-glib.mmp
+EXTRA_DIST += group/libsofia-sip-ua.mmp
+EXTRA_DIST += group/su_source_test.mmp
+EXTRA_DIST += group/su_source_test_reg.rss
+EXTRA_DIST += group/test_http.mmp
+EXTRA_DIST += group/test_http_reg.rss
+EXTRA_DIST += group/test_msg.mmp
+EXTRA_DIST += group/test_msg_reg.rss
+EXTRA_DIST += group/test_nua.mmp
+EXTRA_DIST += group/test_nua_reg.rss
+EXTRA_DIST += group/test_tport.mmp
+EXTRA_DIST += group/test_tport_reg.rss
+EXTRA_DIST += group/torture_sip.mmp
+EXTRA_DIST += group/torture_sip_reg.rss
+EXTRA_DIST += group/torture_su_alloc.mmp
+EXTRA_DIST += group/torture_su_alloc_reg.rss
+EXTRA_DIST += group/torture_su_port.mmp
+EXTRA_DIST += group/torture_su_port_reg.rss
+EXTRA_DIST += group/torture_su_root.mmp
+EXTRA_DIST += group/torture_su_root_reg.rss
+EXTRA_DIST += group/torture_su_tag.mmp
+EXTRA_DIST += group/torture_su_tag_reg.rss
+EXTRA_DIST += group/torture_url.mmp
+EXTRA_DIST += group/torture_url_reg.rss
+
+EXTRA_DIST += sis/libsofia-sip-ua-glib.pkg
+EXTRA_DIST += sis/libsofia-sip-ua.pkg
+EXTRA_DIST += sis/su_source_test.pkg
+EXTRA_DIST += sis/test_nua.pkg
+EXTRA_DIST += sis/test_tport.pkg
@@ -44,6 +44,8 @@
  PT=%PT% %IN% < NUL
 %CHECK%

+@set AWK_SIP_AWK=%MSG_AWK% module=sip
+
@set IN=../libsofia-sip-ua/sip/sofia-sip/sip.h
@set PR=../libsofia-sip-ua/sip/sip_tag.c
@set PR2=../libsofia-sip-ua/sip/sofia-sip/sip_hclasses.h
@@ -53,20 +55,25 @@
@set SIPEXTRA=../libsofia-sip-ua/sip/sip_extra_headers.txt
@set PT=../libsofia-sip-ua/sip/sip_parser_table.c

-%MSG_AWK% module=sip PR=%PR% %IN%  < NUL
+%AWK_SIP_AWK% PR=%PR% %IN% %SIPEXTRA% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR2% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR2% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR3% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR3% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR4% %IN% < NUL
+%AWK_SIP_AWK% PR=%PR4% %IN% < NUL
 %CHECK%
-%MSG_AWK% module=sip PR=%PR5% TEMPLATE1=%PR2%.in TEMPLATE2=%PR3%.in TEMPLATE=%PR5%.in NO_FIRST=1 NO_LAST=1 < NUL %SIPEXTRA%
+%AWK_SIP_AWK% PR=%PR5% NO_FIRST=1 NO_LAST=1 ^
+   TEMPLATE1=%PR2%.in ^
+   TEMPLATE2=%PR3%.in ^
+   TEMPLATE3=%PR4%.in ^
+   TEMPLATE=%PR5%.in %SIPEXTRA% < NUL 
 %CHECK%

-%MSG_AWK% module=sip MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
+%AWK_SIP_AWK% PT=%PT% TEMPLATE=%PT%.in ^
  FLAGFILE=../libsofia-sip-ua/sip/sip_bad_mask ^
-  PT=%PT% %IN% < NUL
+  MC_HASH_SIZE=127 MC_SHORT_SIZE=26 ^
+  %IN% %SIPEXTRA% < NUL
 %CHECK%

@set IN=../libsofia-sip-ua/http/sofia-sip/http.h
@@ -110,8 +117,6 @@
 %CHECK%
 %TAG_AWK% NO_DLL=1 %P%/tport/tport_tag.c  < NUL
 %CHECK%
-%TAG_AWK% NO_DLL=1 %P%/su/su_tag.c  < NUL
-%CHECK%
 %TAG_AWK% NO_DLL=1 %P%/url/url_tag.c  < NUL
 %CHECK%

@@ -1,10 +1,4 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
+/* config.h.in.  Template for Open C  */

 /* Define to 1 if using `alloca.c'. */
 /* #undef C_ALLOCA */
@@ -441,4 +435,4 @@
 /* #undef size_t */

 /* Define to 1 if compiling on Open C environment */
-#define HAVE_OPEN_C 1
+#define HAVE_OPEN_C 1