From 44e41159a089df6574d426f799dd70ba7409fdfd Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 15 Dec 2006 17:24:42 +0000 Subject: [PATCH] fix makefiles git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3671 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/codecs/mod_g723_1/Makefile | 6 +++--- src/mod/codecs/mod_g723_1/mod_g723_1.c | 2 +- src/mod/codecs/mod_g729/Makefile | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile index 47c7c8a2a5..5ace0cdabb 100644 --- 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 e0e6aa5ab9..9196c7f91d 100644 --- 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 ad8c52540c..16852368c0 100644 --- 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