Skip to content
Snippets Groups Projects
Commit 51453628 authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

clean up some damage from today's commit 

convert codecs Makefile to new style


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent e61d3d91
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
codecs/Makefile
+ 14
− 70
View file @ 51453628
......@@ -22,92 +22,36 @@ SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard cod
ifeq ($(wildcard ilbc/iLBC_decode.h),)
MODS:=$(filter-out codec_ilbc,$(MODS))
else
LIBILBC=ilbc/libilbc.a
LIBILBC:=ilbc/libilbc.a
endif
LIBLPC10=lpc10/liblpc10.a
LIBLPC10:=lpc10/liblpc10.a
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: _all
all: $(MODS)
ifeq ($(LIBGSM_LIB),internal)
LIBGSM_INCLUDE:=-Igsm/inc
LIBGSM_LIB:=
clean-depend:
rm -f .depend
codec_gsm.so: gsm/lib/libgsm.a
endif
include ../Makefile.rules
clean: clean-depend
rm -f *.so *.o
[ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
[ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
clean::
$(MAKE) -C gsm clean
$(MAKE) -C lpc10 clean
$(MAKE) -C ilbc clean
$(LIBG723):
CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1 all
gsm/lib/libgsm.a:
CFLAGS="$(ASTCFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a
$(LIBG723B):
CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1b all
$(LIBLPC10):
CFLAGS="$(ASTCFLAGS)" $(MAKE) -C lpc10 all
codec_lpc10.so: $(LIBLPC10)
$(LIBILBC):
CFLAGS="$(ASTCFLAGS)" $(MAKE) -C ilbc all
codec_ilbc.so: codec_ilbc.o $(LIBILBC)
$(CC) $(SOLINK) -o $@ $< $(LIBILBC)
codec_g723_1.so : codec_g723_1.o $(LIBG723)
$(CC) $(SOLINK) -o $@ $< $(LIBG723)
codec_g723_1b.o : codec_g723_1.c
$(CC) -c -o $@ $(CFLAGS) -DANNEX_B -Dsingle $<
codec_g723_1b.so : codec_g723_1b.o $(LIBG723B)
$(CC) $(SOLINK) -o $@ $< $(LIBG723B) -lm
ifeq ($(GSM_LIB),internal)
codec_gsm.o: codec_gsm.c
$(CC) -c -o $@ $(CFLAGS) -Igsm/inc $<
codec_gsm.so: codec_gsm.o gsm/lib/libgsm.a
$(CC) $(SOLINK) -o $@ $< gsm/lib/libgsm.a
else
codec_gsm.o: codec_gsm.c
$(CC) -c -o $@ $(CFLAGS) $(GSM_INCLUDE) $<
codec_gsm.so: codec_gsm.o
$(CC) $(SOLINK) -o $@ $< $(GSM_LIB)
endif
codec_speex.o: codec_speex.c
$(CC) -c -o $@ $(CFLAGS) $(SPEEX_INCLUDE) $<
codec_speex.so: codec_speex.o
$(CC) $(SOLINK) -o $@ $< $(SPEEX_LIB)
codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
$(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm
codec_zap.o: codec_zap.c
$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
%.so : %.o
$(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend
endif
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
depend: .depend
.depend:
../build_tools/mkdep $(CFLAGS) `ls *.c`
codec_ilbc.so: $(LIBILBC)
configure
+ 18
− 18
View file @ 51453628
#! /bin/sh
# From configure.ac Revision: 35812 .
# From configure.ac Revision: 35832 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e.
#
......@@ -701,7 +701,7 @@ gsm_LIB
gsm_INCLUDE
PBX_LIBgsm
KDE_INCLUDE
KDE_LIBS
KDE_LIB
PBX_KDE
KDEINIT
KDEDIR
......@@ -784,16 +784,16 @@ ZLIB_INCLUDE
PBX_LIBZLIB
ZAPTEL_INCLUDE
PBX_ZAPTEL
EDITLINE_LIBS
EDITLINE_LIB
PBX_H323
PBX_IXJUSER
GTKCONFIG
PBX_GTK
GTK_INCLUDE
GTK_LIBS
GTK_LIB
CURL
PBX_CURL
CURLLIBS
CURLLIB
ALLOCA
LIBOBJS
POW_LIB
......@@ -7185,9 +7185,9 @@ echo "${ECHO_T}no" >&6; }
fi
 
if test "${ac_cv_lib_kde_crash}" = "yes"; then
KDE_LIBS="-lkdecore -lkdeui"
KDE_LIB="-lkdecore -lkdeui"
if test "${KDE_DIR}" != ""; then
KDE_LIBS="-L${KDE_DIR}/lib ${KDE_LIBS}"
KDE_LIB="-L${KDE_DIR}/lib ${KDE_LIB}"
KDE_INCLUDE="-I${KDE_DIR}/include"
 
fi
......@@ -18979,15 +18979,15 @@ fi
 
 
 
EDITLINE_LIBS=""
EDITLINE_LIB=""
if test "x$TERMCAP_LIB" != "x" ; then
EDITLINE_LIBS="$TERMCAP_LIB"
EDITLINE_LIB="$TERMCAP_LIB"
elif test "x$TINFO_LIB" != "x" ; then
EDITLINE_LIBS="$TINFO_LIB"
EDITLINE_LIB="$TINFO_LIB"
elif test "x$CURSES_LIB" != "x" ; then
EDITLINE_LIBS="$CURSES_LIB"
EDITLINE_LIB="$CURSES_LIB"
elif test "x$NCURSES_LIB" != "x" ; then
EDITLINE_LIBS="$NCURSES_LIB"
EDITLINE_LIB="$NCURSES_LIB"
else
echo "*** termcap support not found"
exit 1
......@@ -19326,7 +19326,7 @@ fi
 
if test ! "x${GTKCONFIG}" = xNo; then
GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
GTK_LIBS=$(${GTKCONFIG} --libs gthread)
GTK_LIB=$(${GTKCONFIG} --libs gthread)
PBX_GTK=1
 
cat >>confdefs.h <<\_ACEOF
......@@ -19443,7 +19443,7 @@ fi
 
if test ! x"${CURL}" = xNo; then
# check for version
CURLLIBS=$(${CURL} --libs)
CURLLIB=$(${CURL} --libs)
PBX_CURL=1
 
cat >>confdefs.h <<\_ACEOF
......@@ -27649,7 +27649,7 @@ for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
PBX_LIBgsm!$PBX_LIBgsm$ac_delim
KDE_INCLUDE!$KDE_INCLUDE$ac_delim
KDE_LIBS!$KDE_LIBS$ac_delim
KDE_LIB!$KDE_LIB$ac_delim
PBX_KDE!$PBX_KDE$ac_delim
KDEINIT!$KDEINIT$ac_delim
KDEDIR!$KDEDIR$ac_delim
......@@ -27732,16 +27732,16 @@ ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
PBX_LIBZLIB!$PBX_LIBZLIB$ac_delim
ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
EDITLINE_LIBS!$EDITLINE_LIBS$ac_delim
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
PBX_H323!$PBX_H323$ac_delim
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
GTKCONFIG!$GTKCONFIG$ac_delim
PBX_GTK!$PBX_GTK$ac_delim
GTK_INCLUDE!$GTK_INCLUDE$ac_delim
GTK_LIBS!$GTK_LIBS$ac_delim
GTK_LIB!$GTK_LIB$ac_delim
CURL!$CURL$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
CURLLIBS!$CURLLIBS$ac_delim
CURLLIB!$CURLLIB$ac_delim
ALLOCA!$ALLOCA$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
_ACEOF
......
configure.ac
+ 13
− 13
View file @ 51453628
......@@ -295,13 +295,13 @@ if test "${USE_KDE}" != "no"; then
fi
if test "${ac_cv_lib_kde_crash}" = "yes"; then
KDE_LIBS="-lkdecore -lkdeui"
KDE_LIB="-lkdecore -lkdeui"
if test "${KDE_DIR}" != ""; then
KDE_LIBS="-L${KDE_DIR}/lib ${KDE_LIBS}"
KDE_LIB="-L${KDE_DIR}/lib ${KDE_LIB}"
KDE_INCLUDE="-I${KDE_DIR}/include"
AC_SUBST([KDE_INCLUDE])
fi
AC_SUBST([KDE_LIBS])
AC_SUBST([KDE_LIB])
PBX_KDE=1
AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE library])
elif test ! -z "${KDE_MANDATORY}";
......@@ -767,20 +767,20 @@ fi
AC_SUBST([PBX_ZAPTEL])
EDITLINE_LIBS=""
EDITLINE_LIB=""
if test "x$TERMCAP_LIB" != "x" ; then
EDITLINE_LIBS="$TERMCAP_LIB"
EDITLINE_LIB="$TERMCAP_LIB"
elif test "x$TINFO_LIB" != "x" ; then
EDITLINE_LIBS="$TINFO_LIB"
EDITLINE_LIB="$TINFO_LIB"
elif test "x$CURSES_LIB" != "x" ; then
EDITLINE_LIBS="$CURSES_LIB"
EDITLINE_LIB="$CURSES_LIB"
elif test "x$NCURSES_LIB" != "x" ; then
EDITLINE_LIBS="$NCURSES_LIB"
EDITLINE_LIB="$NCURSES_LIB"
else
echo "*** termcap support not found"
exit 1
fi
AC_SUBST(EDITLINE_LIBS)
AC_SUBST(EDITLINE_LIB)
AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
AC_SUBST(PBX_H323)
......@@ -797,24 +797,24 @@ PBX_GTK=0
AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
if test ! "x${GTKCONFIG}" = xNo; then
GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
GTK_LIBS=$(${GTKCONFIG} --libs gthread)
GTK_LIB=$(${GTKCONFIG} --libs gthread)
PBX_GTK=1
AC_DEFINE([HAVE_GTK], 1, [Define if your system has the GTK libraries.])
fi
AC_SUBST(PBX_GTK)
AC_SUBST(GTK_INCLUDE)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_LIB)
PBX_CURL=0
AC_PATH_TOOL([CURL], [curl-config], No)
if test ! x"${CURL}" = xNo; then
# check for version
CURLLIBS=$(${CURL} --libs)
CURLLIB=$(${CURL} --libs)
PBX_CURL=1
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi
AC_SUBST(PBX_CURL)
AC_SUBST(CURLLIBS)
AC_SUBST(CURLLIB)
AC_FUNC_ALLOCA
AC_HEADER_DIRENT
......
makeopts.in
+ 5
− 5
View file @ 51453628
......@@ -109,12 +109,12 @@ QT_INCLUDE=@QT_INCLUDE@
KDEDIR=@KDEDIR@
KDE_INCLUDE=@KDE_INCLUDE@
KDE_LIB=@KDE_LIBS@
KDE_LIB=@KDE_LIB@
GTK_INCLUDE=@GTK_INCLUDE@
GTK_LIB=@GTK_LIBS@
GTK_LIB=@GTK_LIB@
CURL_LIB=@CURLLIBS@
CURL_LIB=@CURLLIB@
LIBGSM_LIB=@gsm_LIB@
LIBGSM_INCLUDE=@gsm_INCLUDE@
......@@ -125,9 +125,9 @@ CURSES_INCLUDE=@CURSES_INCLUDE@
NCURSES_LIB=@NCURSES_LIB@
NCURSES_INCLUDE=@NCURSES_INCLUDE@
EDITLINE_LIB=@EDITLINE_LIBS@
EDITLINE_LIB=@EDITLINE_LIB@
RADIUSCLIENT_LIB=@RADIUSCLIENT_LIB@
RADIUSCLIENT_INCLUDE=@RADIUSCLIENT_INCLUDE@
NETSNMP_LIB=@NETSNMP_LIBS@
NETSNMP_LIB=@NETSNMP_LIB@
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment