fix makefiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3671 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index 47c7c8a2a5a0eb3ef92da81b92ef14838297f8a4..5ace0cdabba2fe476201f5395f5b1af70a891ec5 100644 (file)
--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@@ -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
 

diff --git a/src/mod/codecs/mod_g723_1/mod_g723_1.c b/src/mod/codecs/mod_g723_1/mod_g723_1.c
index e0e6aa5ab957b82d7f69ab9b0b66c91f4f9a1674..9196c7f91d15ca0f06f26b9d5e6fa34ffaf1878a 100644 (file)
--- a/src/mod/codecs/mod_g723_1/mod_g723_1.c
+++ b/src/mod/codecs/mod_g723_1/mod_g723_1.c
@@ -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

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index ad8c52540cab678831d89b57a03a0f5d56441aee..16852368c06a9975c8fa70087be68098a9b3d938 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -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 @@ endif
 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