From fd4a60c4599189c2022f31bab18d03df39d3ea3e Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 25 Jun 2008 23:05:28 +0000 Subject: Merged revisions 125132 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it get app_rpt building again after the DAHDI changes (closes issue #12911) Reported by: tzafrir ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125138 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'main/Makefile') diff --git a/main/Makefile b/main/Makefile index 679f79d6e..06ee26001 100644 --- a/main/Makefile +++ b/main/Makefile @@ -130,10 +130,6 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm rm ast_expr2.o ast_expr2f.o -channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) -asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) - - ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) endif -- cgit v1.2.3