aboutsummaryrefslogtreecommitdiffstats
path: root/main/Makefile
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-04 00:54:22 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-04 00:54:22 +0000
commit061588893853727ee723a4f153e220c4f27589ee (patch)
treec799ebf394bf6ac75e280699db7bad60096b9487 /main/Makefile
parent44d4e9a33833ed6d4441f4ced64d3e295b6067b2 (diff)
Merged revisions 112712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r112712 | file | 2008-04-03 21:53:19 -0300 (Thu, 03 Apr 2008) | 10 lines Merged revisions 112711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r112711 | file | 2008-04-03 21:52:36 -0300 (Thu, 03 Apr 2008) | 2 lines Pass in the path to Zaptel for systems that install Zaptel headers in a separate location. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@112713 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
-rw-r--r--main/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile
index b24e19e81..976c37b14 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -131,6 +131,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
rm ast_expr2.o ast_expr2f.o
channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)