[asterisk-commits] russell: branch group/security_events r198144 - in /team/group/security_event...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri May 29 14:55:18 2009
New Revision: 198144

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198144
Log:
sync with trunk to avoid conflict

Modified:
    team/group/security_events/   (props changed)
    team/group/security_events/main/Makefile

Propchange: team/group/security_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 29 14:55:18 2009
@@ -1,1 +1,1 @@
-/trunk:1-198091
+/trunk:1-198142

Modified: team/group/security_events/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/Makefile?view=diff&rev=198144&r1=198143&r2=198144
==============================================================================
--- team/group/security_events/main/Makefile (original)
+++ team/group/security_events/main/Makefile Fri May 29 14:55:18 2009
@@ -17,19 +17,9 @@
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
-OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \
-	translate.o file.o pbx.o cli.o md5.o term.o heap.o \
-	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
-	cdr.o tdd.o acl.o udptl.o manager.o asterisk.o security_events.o \
-	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
-	astmm.o astfd.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
-	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
-	strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
-	astobj2.o hashtab.o global_datastores.o version.o \
-	features.o taskprocessor.o timing.o datastore.o xml.o xmldoc.o \
-	strings.o bridging.o poll.o rtp_engine.o stun.o autochan.o
+SRC=$(wildcard *.c)
+OBJSFILTER=fskmodem_int.o fskmodem_float.o cygload.o buildinfo.o
+OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static