summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorEliel C. Sardanons <eliels@gmail.com>2009-05-29 19:46:07 +0000
committerEliel C. Sardanons <eliels@gmail.com>2009-05-29 19:46:07 +0000
commit43dcf1001bb99e6d064573fe43f05f17df16540a (patch)
treeee2e829d8b0b6796179b54f67ad5e0c5712e903f /main
parentaaf5eb105ed55b7856dfd79b352a1669cb51d437 (diff)
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/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@198139 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/Makefile16
1 files changed, 3 insertions, 13 deletions
diff --git a/main/Makefile b/main/Makefile
index e5225d68f..21d675ee7 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -17,19 +17,9 @@ all: asterisk
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