[asterisk-commits] kpfleming: trunk r43298 - in /trunk: ./ channels/h323/ include/ main/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Sep 19 16:48:57 2006
New Revision: 43298

URL: http://svn.digium.com/view/asterisk?rev=43298&view=rev
Log:
move this header to include where it belongs

Added:
    trunk/include/jitterbuf.h
      - copied unchanged from r43262, trunk/main/jitterbuf.h
Removed:
    trunk/main/jitterbuf.h
Modified:
    trunk/Makefile
    trunk/channels/h323/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=43298&r1=43297&r2=43298&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Sep 19 16:48:57 2006
@@ -106,7 +106,7 @@
 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)

Modified: trunk/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/Makefile?rev=43298&r1=43297&r2=43298&view=diff
==============================================================================
--- trunk/channels/h323/Makefile (original)
+++ trunk/channels/h323/Makefile Tue Sep 19 16:48:57 2006
@@ -6,7 +6,7 @@
 
 .PHONY: Makefile.ast clean
 
-default::	opt
+default::	
 
 # Verify those options with main Makefile
 STDCCFLAGS	= -DNDEBUG
@@ -21,7 +21,7 @@
 OBJS		=
 
 ifndef OPENH323DIR
-OPENH323DIR=/usr/src/OpenH323/openh323
+OPENH323DIR=
 endif
 
 include $(OPENH323DIR)/openh323u.mak