[Freeswitch-trunk] [commit] r3671 - in freeswitch/trunk/src/mod/codecs: mod_g723_1 mod_g729

[Freeswitch SVN]

Author: anthm
Date: Fri Dec 15 12:24:42 2006
New Revision: 3671

Modified:
   freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile
   freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c
   freeswitch/trunk/src/mod/codecs/mod_g729/Makefile

Log:
fix makefiles

Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile	Fri Dec 15 12:24:42 2006
@@ -1,7 +1,7 @@
-ifeq ($(shell ls $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1)
+ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1)
 
-CFLAGS += -I$(PREFIX)/include/g723
-LDFLAGS +=-lg723
+CFLAGS += -I$(PREFIX)/include/libg723_1
+LDFLAGS +=-lg723_1
 
 else
 

Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c	Fri Dec 15 12:24:42 2006
@@ -34,7 +34,7 @@
 #include "switch.h"
 
 #ifndef G723_PASSTHROUGH
-#include "g723.h"
+#include "g723_1.h"
 
 #define TYPE_HIGH 0x0
 #define TYPE_LOW 0x1

Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile	(original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile	Fri Dec 15 12:24:42 2006
@@ -1,6 +1,6 @@
-ifeq ($(shell ls $(BASE)/libs/libg729),$(BASE)/libs/libg729)
+ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729)
 
-CFLAGS += -I$(PREFIX)/include/g729
+CFLAGS += -I$(PREFIX)/include/libg729
 LDFLAGS +=-lg729
 
 else
@@ -12,7 +12,6 @@
 all:	$(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o