[asterisk-commits] eliel: trunk r198139 - /trunk/main/Makefile

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri May 29 14:46:16 CDT 2009


Author: eliel
Date: Fri May 29 14:46:07 2009
New Revision: 198139

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198139
Log:
Simplify the Makefile and avoid needing to specify each object file.

Instead of specifying every object file, use make's magic to generate
it.
This will generate less conflicts in team branches when a new file is
added in trunk.

(closes issue #15226)
Reported by: eliel
Patches:
      makefile uploaded by eliel (license 64)

      Review: http://reviewboard.asterisk.org/r/269/ 


Modified:
    trunk/main/Makefile

Modified: trunk/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/Makefile?view=diff&rev=198139&r1=198138&r2=198139
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri May 29 14:46:07 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 \
-	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




More information about the asterisk-commits mailing list