From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 19 Sep 2006 21:48:57 +0000 (+0000)
Subject: move this header to include where it belongs
X-Git-Tag: 1.4.0-beta1~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1485fa4c2453291389f2d9e9cee235d8a6722083;p=thirdparty%2Fasterisk.git

move this header to include where it belongs


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 0b381dbdbd..6db72a5e62 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ASTCFLAGS=
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-MOD_SUBDIR_CFLAGS=-I../include -I../main
+MOD_SUBDIR_CFLAGS=-I../include
 OTHER_SUBDIR_CFLAGS=-I../include
 
 ifeq ($(OSARCH),linux-gnu)
diff --git a/channels/h323/Makefile b/channels/h323/Makefile
index df309e6f62..eea355ebd6 100644
--- a/channels/h323/Makefile
+++ b/channels/h323/Makefile
@@ -6,7 +6,7 @@
 
 .PHONY: Makefile.ast clean
 
-default::	opt
+default::	
 
 # Verify those options with main Makefile
 STDCCFLAGS	= -DNDEBUG
@@ -21,7 +21,7 @@ OBJDIR		= .
 OBJS		=
 
 ifndef OPENH323DIR
-OPENH323DIR=/usr/src/OpenH323/openh323
+OPENH323DIR=
 endif
 
 include $(OPENH323DIR)/openh323u.mak
diff --git a/main/jitterbuf.h b/include/jitterbuf.h
similarity index 100%
rename from main/jitterbuf.h
rename to include/jitterbuf.h