[Freeswitch-svn] [commit] r4532 - in freeswitch/trunk/libs/codec/lpc10: . build build/config src

Freeswitch SVN mikej at freeswitch.org
Sun Mar 11 06:14:11 EDT 2007


Author: mikej
Date: Sun Mar 11 06:14:11 2007
New Revision: 4532

Added:
   freeswitch/trunk/libs/codec/lpc10/build/   (props changed)
      - copied from r4528, /freeswitch/private/packaging/libs/codec/lpc10/build/
   freeswitch/trunk/libs/codec/lpc10/build/config/
      - copied from r4528, /freeswitch/private/packaging/libs/codec/lpc10/build/config/
   freeswitch/trunk/libs/codec/lpc10/configure.gnu
   freeswitch/trunk/libs/codec/lpc10/src/
      - copied from r4528, /freeswitch/private/packaging/libs/codec/lpc10/src/
Removed:
   freeswitch/trunk/libs/codec/lpc10/analys.c
   freeswitch/trunk/libs/codec/lpc10/bsynz.c
   freeswitch/trunk/libs/codec/lpc10/chanwr.c
   freeswitch/trunk/libs/codec/lpc10/config.guess
   freeswitch/trunk/libs/codec/lpc10/config.sub
   freeswitch/trunk/libs/codec/lpc10/dcbias.c
   freeswitch/trunk/libs/codec/lpc10/decode.c
   freeswitch/trunk/libs/codec/lpc10/deemp.c
   freeswitch/trunk/libs/codec/lpc10/depcomp
   freeswitch/trunk/libs/codec/lpc10/difmag.c
   freeswitch/trunk/libs/codec/lpc10/dyptrk.c
   freeswitch/trunk/libs/codec/lpc10/encode.c
   freeswitch/trunk/libs/codec/lpc10/energy.c
   freeswitch/trunk/libs/codec/lpc10/f2c.h
   freeswitch/trunk/libs/codec/lpc10/f2clib.c
   freeswitch/trunk/libs/codec/lpc10/ham84.c
   freeswitch/trunk/libs/codec/lpc10/hp100.c
   freeswitch/trunk/libs/codec/lpc10/invert.c
   freeswitch/trunk/libs/codec/lpc10/irc2pc.c
   freeswitch/trunk/libs/codec/lpc10/ivfilt.c
   freeswitch/trunk/libs/codec/lpc10/lpc10.h
   freeswitch/trunk/libs/codec/lpc10/lpcdec.c
   freeswitch/trunk/libs/codec/lpc10/lpcenc.c
   freeswitch/trunk/libs/codec/lpc10/lpcini.c
   freeswitch/trunk/libs/codec/lpc10/lpfilt.c
   freeswitch/trunk/libs/codec/lpc10/median.c
   freeswitch/trunk/libs/codec/lpc10/missing
   freeswitch/trunk/libs/codec/lpc10/mload.c
   freeswitch/trunk/libs/codec/lpc10/onset.c
   freeswitch/trunk/libs/codec/lpc10/pitsyn.c
   freeswitch/trunk/libs/codec/lpc10/placea.c
   freeswitch/trunk/libs/codec/lpc10/placev.c
   freeswitch/trunk/libs/codec/lpc10/preemp.c
   freeswitch/trunk/libs/codec/lpc10/prepro.c
   freeswitch/trunk/libs/codec/lpc10/random.c
   freeswitch/trunk/libs/codec/lpc10/rcchk.c
   freeswitch/trunk/libs/codec/lpc10/synths.c
   freeswitch/trunk/libs/codec/lpc10/tbdm.c
   freeswitch/trunk/libs/codec/lpc10/voicin.c
   freeswitch/trunk/libs/codec/lpc10/vparms.c
Modified:
   freeswitch/trunk/libs/codec/lpc10/Makefile.am
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_cflags_gcc_option.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_cflags_sun_option.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_gcc_archflag.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_gcc_x86_cpuid.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_prog_gzip.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ac_prog_wget.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ax_cc_maxopt.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ax_cflags_warn_all_ansi.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ax_check_compiler_flags.m4
   freeswitch/trunk/libs/codec/lpc10/build/config/ax_compiler_vendor.m4
   freeswitch/trunk/libs/codec/lpc10/configure.ac
   freeswitch/trunk/libs/codec/lpc10/src/analys.c
   freeswitch/trunk/libs/codec/lpc10/src/bsynz.c
   freeswitch/trunk/libs/codec/lpc10/src/chanwr.c
   freeswitch/trunk/libs/codec/lpc10/src/dcbias.c
   freeswitch/trunk/libs/codec/lpc10/src/decode.c
   freeswitch/trunk/libs/codec/lpc10/src/deemp.c
   freeswitch/trunk/libs/codec/lpc10/src/difmag.c
   freeswitch/trunk/libs/codec/lpc10/src/dyptrk.c
   freeswitch/trunk/libs/codec/lpc10/src/encode.c
   freeswitch/trunk/libs/codec/lpc10/src/energy.c
   freeswitch/trunk/libs/codec/lpc10/src/f2c.h
   freeswitch/trunk/libs/codec/lpc10/src/f2clib.c
   freeswitch/trunk/libs/codec/lpc10/src/ham84.c
   freeswitch/trunk/libs/codec/lpc10/src/hp100.c
   freeswitch/trunk/libs/codec/lpc10/src/invert.c
   freeswitch/trunk/libs/codec/lpc10/src/irc2pc.c
   freeswitch/trunk/libs/codec/lpc10/src/ivfilt.c
   freeswitch/trunk/libs/codec/lpc10/src/lpc10.h
   freeswitch/trunk/libs/codec/lpc10/src/lpcdec.c
   freeswitch/trunk/libs/codec/lpc10/src/lpcenc.c
   freeswitch/trunk/libs/codec/lpc10/src/lpcini.c
   freeswitch/trunk/libs/codec/lpc10/src/lpfilt.c
   freeswitch/trunk/libs/codec/lpc10/src/median.c
   freeswitch/trunk/libs/codec/lpc10/src/mload.c
   freeswitch/trunk/libs/codec/lpc10/src/onset.c
   freeswitch/trunk/libs/codec/lpc10/src/pitsyn.c
   freeswitch/trunk/libs/codec/lpc10/src/placea.c
   freeswitch/trunk/libs/codec/lpc10/src/placev.c
   freeswitch/trunk/libs/codec/lpc10/src/preemp.c
   freeswitch/trunk/libs/codec/lpc10/src/prepro.c
   freeswitch/trunk/libs/codec/lpc10/src/random.c
   freeswitch/trunk/libs/codec/lpc10/src/rcchk.c
   freeswitch/trunk/libs/codec/lpc10/src/synths.c
   freeswitch/trunk/libs/codec/lpc10/src/tbdm.c
   freeswitch/trunk/libs/codec/lpc10/src/voicin.c
   freeswitch/trunk/libs/codec/lpc10/src/vparms.c

Log:
updated autotools for liblpc10.  Remove hardcoded gcc options.

Modified: freeswitch/trunk/libs/codec/lpc10/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/codec/lpc10/Makefile.am	(original)
+++ freeswitch/trunk/libs/codec/lpc10/Makefile.am	Sun Mar 11 06:14:11 2007
@@ -3,20 +3,23 @@
 AUTOMAKE_OPTS= gnu
 NAME=liblpc10
 
-AM_CC=gcc
-AM_CFLAGS	= -Wall -O3 -funroll-loops
+AM_CFLAGS   = $(new_AM_CFLAGS)
 AM_CPPFLAGS = $(AM_CFLAGS)
+AM_LDFLAGS  = $(new_AM_LDFLAGS) -lm
 
-lib_LTLIBRARIES		= libg7xx.la
-liblpc10_la_SOURCES = analys.c  dcbias.c  difmag.c  energy.c  hp100.c   ivfilt.c  lpcini.c  mload.c   placea.c  prepro.c  synths.c  vparms.c \
-bsynz.c   decode.c  dyptrk.c  f2clib.c  invert.c  lpcdec.c  lpfilt.c  onset.c   placev.c  random.c  tbdm.c \
-chanwr.c  deemp.c   encode.c  ham84.c   irc2pc.c  lpcenc.c  median.c  pitsyn.c  preemp.c  rcchk.c   voicin.c 
+lib_LTLIBRARIES		= liblpc10.la
+liblpc10_la_SOURCES = src/analys.c src/dcbias.c src/difmag.c src/energy.c src/hp100.c \
+src/ivfilt.c src/lpcini.c src/mload.c src/placea.c src/prepro.c src/synths.c \
+src/vparms.c src/bsynz.c src/decode.c src/dyptrk.c src/f2clib.c src/invert.c \
+src/lpcdec.c src/lpfilt.c src/onset.c src/placev.c src/random.c src/tbdm.c \
+src/chanwr.c src/deemp.c src/encode.c src/ham84.c src/irc2pc.c src/lpcenc.c \
+src/median.c src/pitsyn.c src/preemp.c src/rcchk.c src/voicin.c 
 
 liblpc10_la_CFLAGS	= $(AM_CFLAGS)
 liblpc10_la_LDFLAGS	= 
 
-library_includedir	= $(prefix)/include/lpc10
-library_include_HEADERS =  f2c.h  lpc10.h
+library_includedir	= $(prefix)/include
+library_include_HEADERS =  src/f2c.h  src/lpc10.h
 
 
 

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_cflags_gcc_option.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_cflags_sun_option.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_gcc_archflag.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_gcc_x86_cpuid.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_prog_gzip.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ac_prog_wget.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ax_cc_maxopt.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ax_cflags_warn_all_ansi.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ax_check_compiler_flags.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/build/config/ax_compiler_vendor.m4
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/configure.ac
==============================================================================
--- freeswitch/trunk/libs/codec/lpc10/configure.ac	(original)
+++ freeswitch/trunk/libs/codec/lpc10/configure.ac	Sun Mar 11 06:14:11 2007
@@ -3,15 +3,91 @@
 
 AC_PREREQ(2.59)
 AC_INIT(liblpc10, 1.0, liblpc10)
+AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE(liblpc10,1.0)
-AC_CONFIG_SRCDIR([f2clib.c])
 
+#Set default language
+AC_LANG_C
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+#Check for compiler vendor
+AX_COMPILER_VENDOR
+
+#  Optimize
+AC_ARG_ENABLE(optimization,
+[AC_HELP_STRING([--enable-optimization],[Set if you want us to add max optimising compiler flags])],[enable_optimizer="$enableval"],[enable_optimizer="no"])
+
+if test "${enable_optimizer}" = "yes" ; then
+        AC_DEFINE([OPTIMZER],[],[Enable Optimization.])
+        AX_CC_MAXOPT
+fi
+
+#  Enable debugging
+AC_ARG_ENABLE(debug,
+[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"])
+
+if test "${enable_debug}" = "yes"; then
+        AC_DEFINE([DEBUG],[],[Enable extra debugging.])
+        AX_CFLAGS_WARN_ALL_ANSI
+fi
+
+AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
+
+
+case "$host" in
+                *-solaris2*)
+                        if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then                                SOLINK="-Bdynamic -dy -G"
+                                new_AM_CFLAGS="-KPIC -DPIC"
+                                new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+                        elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then                                SOLINK="-Bdynamic -dy -G"
+                                new_AM_CFLAGS="-fPIC"
+                                new_AM_LDFLAGS=""
+                                IN_LINE=inline
+                        fi
+                        DYNAMIC_LIB_EXTEN="so"
+                ;;
+                *-darwin*)
+                        if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+                                SOLINK="-dynamic -bundle -force-flat-namespace"
+                                new_AM_CFLAGS="-DMACOSX"
+                                new_AM_LDFLAGS=""
+                        fi
+                        DYNAMIC_LIB_EXTEN="dylib"
+                ;;
+                x86_64-*-linux-gnu)
+                        if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+                                SOLINK="-Bdynamic -dy -G"
+                                new_AM_CFLAGS="-KPIC -DPIC"
+                                new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+                        elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+                                SOLINK="-shared -Xlinker -x"
+                                new_AM_CFLAGS="-fPIC"
+                                new_AM_LDFLAGS=""
+                        fi
+                        DYNAMIC_LIB_EXTEN="so"
+                ;;
+                i*6-*-linux-gnu)
+                        if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
+                                SOLINK="-Bdynamic -dy -G"
+                                new_AM_CFLAGS="-KPIC -DPIC"
+                                new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib"
+                        elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
+                                SOLINK="-shared -Xlinker -x"
+                                new_AM_CFLAGS="-fpic"
+                                new_AM_LDFLAGS=""
+                        fi
+                        DYNAMIC_LIB_EXTEN="so"
+                ;;
+esac
+AC_SUBST(new_AM_CFLAGS)
+AC_SUBST(new_AM_LDFLAGS)
+AC_SUBST(SOLINK)
+AC_SUBST(DYNAMIC_LIB_EXTEN)
+
 # Checks for libraries.
 
 # Checks for header files.

Added: freeswitch/trunk/libs/codec/lpc10/configure.gnu
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/codec/lpc10/configure.gnu	Sun Mar 11 06:14:11 2007
@@ -0,0 +1,2 @@
+#! /bin/sh
+./configure "$@" --disable-shared

Modified: freeswitch/trunk/libs/codec/lpc10/src/analys.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/bsynz.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/chanwr.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/dcbias.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/decode.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/deemp.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/difmag.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/dyptrk.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/encode.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/energy.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/f2c.h
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/f2clib.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/ham84.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/hp100.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/invert.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/irc2pc.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/ivfilt.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/lpc10.h
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/lpcdec.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/lpcenc.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/lpcini.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/lpfilt.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/median.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/mload.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/onset.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/pitsyn.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/placea.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/placev.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/preemp.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/prepro.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/random.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/rcchk.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/synths.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/tbdm.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/voicin.c
==============================================================================

Modified: freeswitch/trunk/libs/codec/lpc10/src/vparms.c
==============================================================================



More information about the Freeswitch-svn mailing list