[asterisk-commits] branch kpfleming/vldtmf r9164 - in /team/kpfleming/vldtmf: ./ channels/misdn/...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Feb  6 14:27:59 2006
New Revision: 9164

URL: http://svn.digium.com/view/asterisk?rev=9164&view=rev
Log:
bring up to date so automerge can work

Added:
    team/kpfleming/vldtmf/funcs/func_sha1.c
      - copied unchanged from r9163, trunk/funcs/func_sha1.c
    team/kpfleming/vldtmf/include/asterisk/sha1.h
      - copied unchanged from r9163, trunk/include/asterisk/sha1.h
    team/kpfleming/vldtmf/sha1.c
      - copied unchanged from r9163, trunk/sha1.c
Modified:
    team/kpfleming/vldtmf/   (props changed)
    team/kpfleming/vldtmf/channels/misdn/Makefile
    team/kpfleming/vldtmf/funcs/Makefile

Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
--- branch-1.2-blocked (added)
+++ branch-1.2-blocked Mon Feb  6 14:27:59 2006
@@ -1,0 +1,1 @@
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8124,8134,8394,8412,8414,8418,8429,8433,8445,8562,8573,8600,8619,8666,8808,9073

Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/kpfleming/vldtmf/
            ('svnmerge-blocked' removed)

Propchange: team/kpfleming/vldtmf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb  6 14:27:59 2006
@@ -1,1 +1,1 @@
-/trunk:1-9125
+/trunk:1-9163

Modified: team/kpfleming/vldtmf/channels/misdn/Makefile
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/channels/misdn/Makefile?rev=9164&r1=9163&r2=9164&view=diff
==============================================================================
--- team/kpfleming/vldtmf/channels/misdn/Makefile (original)
+++ team/kpfleming/vldtmf/channels/misdn/Makefile Mon Feb  6 14:27:59 2006
@@ -6,7 +6,7 @@
 
 # Verify those options with main Makefile
 CFLAGS		= -pipe -c -Wall
-ifeq ($(PROC),x86_64)
+ifeq ($(shell uname -m),x86_64)
 CFLAGS	       += -fPIC
 endif
 SOURCES		= isdn_lib.c isdn_msg_parser.c 

Modified: team/kpfleming/vldtmf/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/kpfleming/vldtmf/funcs/Makefile?rev=9164&r1=9163&r2=9164&view=diff
==============================================================================
--- team/kpfleming/vldtmf/funcs/Makefile (original)
+++ team/kpfleming/vldtmf/funcs/Makefile Mon Feb  6 14:27:59 2006
@@ -24,7 +24,8 @@
          func_timeout.o \
          func_language.o \
          func_moh.o \
-         func_base64.o
+         func_base64.o \
+         func_sha1.o
 
 AVAILABLE_FUNCS=$(filter-out $(BUILTINS),$(patsubst %.c,%.o,$(wildcard func*.c)))