aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 21:48:57 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 21:48:57 +0000
commit44db0fbbd1492f8180bcb80f7f1c026ce5a1c0c2 (patch)
treeb31bc262cbf6e69a8c4926900f56161fb8ec172d
parent8ba37fe7cd4465ceeb75a97672775ffb516633dd (diff)
move this header to include where it belongs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43298 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile2
-rw-r--r--channels/h323/Makefile4
-rw-r--r--include/jitterbuf.h (renamed from main/jitterbuf.h)0
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0b381dbdb..6db72a5e6 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 df309e6f6..eea355ebd 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
index 3213534d0..3213534d0 100644
--- a/main/jitterbuf.h
+++ b/include/jitterbuf.h