kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove DYNAMIC_LIB_EXTEN because we use libtool to figure this all out now

This commit is contained in:
Michael Jerris 2014-03-14 18:04:07 -04:00
parent ff555aa519
commit 4216e3e056
9 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -773,7 +773,7 @@ modclean: $(switch_builddir)/modules.conf
@cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean
modwipe: modwipe:
rm -f $(modulesdir)/*.${DYNAMIC_LIB_EXTEN} $(modulesdir)/*.la rm -f $(modulesdir)/*.so $(modulesdir)/*.la $(modulesdir)/*.dll $(modulesdir)/*.dylib
dox: dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf cd docs && doxygen $(PWD)/docs/Doxygen.conf

1
build/modmake.rules.in
View File

@ -47,7 +47,6 @@ DEFS=@DEFS@
DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH
LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
OSARCH=`uname -s` OSARCH=`uname -s`
DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@ LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@
SOLINK = @SOLINK@ SOLINK = @SOLINK@

13
configure.ac
View File

@ -236,16 +236,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
else else
AC_ERROR([Please update configure.in with SOLINK values for your compiler]) AC_ERROR([Please update configure.in with SOLINK values for your compiler])
fi fi
# set DYNAMIC_LIB_EXTEN
# we should really be using libtool so we don't need to do this
case "$host" in
*cygwin* | *mingw*)
DYNAMIC_LIB_EXTEN="dll"
;;
*)
DYNAMIC_LIB_EXTEN="so"
;;
esac
## ##
# detect libtool major version, # detect libtool major version,
@ -263,7 +253,7 @@ if test -z "$LIBTOOL_MAJOR_VERSION" ; then
fi fi
AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}]) AC_MSG_RESULT([${LIBTOOL_MAJOR_VERSION}])
LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" LIBTOOL_LIB_EXTEN=so
if test "${LIBTOOL_MAJOR_VERSION}" = "2" ; then if test "${LIBTOOL_MAJOR_VERSION}" = "2" ; then
LIBTOOL_LIB_EXTEN="la" LIBTOOL_LIB_EXTEN="la"
@ -626,7 +616,6 @@ AC_SUBST(ESL_LDFLAGS)
AC_SUBST(PLATFORM_CORE_LDFLAGS) AC_SUBST(PLATFORM_CORE_LDFLAGS)
AC_SUBST(PLATFORM_CORE_LIBS) AC_SUBST(PLATFORM_CORE_LIBS)
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN)
AC_SUBST(LIBTOOL_LIB_EXTEN) AC_SUBST(LIBTOOL_LIB_EXTEN)
# Checks for header files. # Checks for header files.

6
libs/freetdm/Makefile.am
View File

@ -270,16 +270,16 @@ endif
dox doxygen: dox doxygen:
doxygen $(FT_SRCDIR)/docs/Doxygen.conf doxygen $(FT_SRCDIR)/docs/Doxygen.conf
mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN): libfreetdm.la mod_freetdm/mod_freetdm.c mod_freetdm/mod_freetdm.so: libfreetdm.la mod_freetdm/mod_freetdm.c
$(MAKE) -C mod_freetdm $(MAKE) -C mod_freetdm
mod_freetdm: mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) mod_freetdm: mod_freetdm/mod_freetdm.so
mod_freetdm-install: mod_freetdm mod_freetdm-install: mod_freetdm
$(MAKE) -C mod_freetdm install $(MAKE) -C mod_freetdm install
mod_freetdm-clean: mod_freetdm-clean:
@if [ -f mod_freetdm/mod_freetdm.$(DYNAMIC_LIB_EXTEN) ] ; then \ @if [ -f mod_freetdm/mod_freetdm.so ] ; then \
$(MAKE) -C mod_freetdm clean ; \ $(MAKE) -C mod_freetdm clean ; \
fi fi

12
libs/freetdm/configure.ac
View File

@ -120,18 +120,6 @@ if test "${enable_debug}" != "no"; then
fi fi
AC_SUBST([COMP_VENDOR_CFLAGS]) AC_SUBST([COMP_VENDOR_CFLAGS])
# set DYNAMIC_LIB_EXTEN
# we should really be using libtool so we don't need to do this
case "$host" in
*cygwin* | *mingw*)
DYNAMIC_LIB_EXTEN="dll"
;;
*)
DYNAMIC_LIB_EXTEN="so"
;;
esac
AC_SUBST([DYNAMIC_LIB_EXTEN])
AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([pthread], [pthread_create])
AC_CHECK_LIB([m], [cos]) AC_CHECK_LIB([m], [cos])

6
libs/libdingaling/configure.ac
View File

@ -58,7 +58,6 @@ case "$host" in
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
IN_LINE=inline IN_LINE=inline
fi fi
DYNAMIC_LIB_EXTEN="so"
;; ;;
*-darwin*) *-darwin*)
if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
@ -66,7 +65,6 @@ case "$host" in
new_AM_CFLAGS="-DMACOSX" new_AM_CFLAGS="-DMACOSX"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="dylib"
IN_LINE=inline IN_LINE=inline
;; ;;
x86_64-*-linux-gnu) x86_64-*-linux-gnu)
@ -80,7 +78,6 @@ case "$host" in
new_AM_CFLAGS="-fPIC" new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline IN_LINE=inline
;; ;;
i*6-*-linux-gnu) i*6-*-linux-gnu)
@ -94,7 +91,6 @@ case "$host" in
new_AM_CFLAGS="-fpic" new_AM_CFLAGS="-fpic"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline IN_LINE=inline
;; ;;
*) *)
@ -108,7 +104,6 @@ case "$host" in
new_AM_CFLAGS="-fPIC" new_AM_CFLAGS="-fPIC"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="so"
IN_LINE=inline IN_LINE=inline
esac esac
@ -125,7 +120,6 @@ fi
AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_CFLAGS)
AC_SUBST(new_AM_LDFLAGS) AC_SUBST(new_AM_LDFLAGS)
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN)
AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline]) AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline])
# Checks for header files. # Checks for header files.

6
libs/openzap/Makefile.am
View File

@ -257,16 +257,16 @@ endif
dox doxygen: dox doxygen:
cd docs && doxygen $(OZ_SRCDIR)/docs/Doxygen.conf cd docs && doxygen $(OZ_SRCDIR)/docs/Doxygen.conf
mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN): $(MYLIB) mod_openzap/mod_openzap.c mod_openzap/mod_openzap.so: $(MYLIB) mod_openzap/mod_openzap.c
cd mod_openzap && make cd mod_openzap && make
mod_openzap: mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN) mod_openzap: mod_openzap/mod_openzap.so
mod_openzap-install: mod_openzap mod_openzap-install: mod_openzap
cd mod_openzap && make install cd mod_openzap && make install
mod_openzap-clean: mod_openzap-clean:
@if [ -f mod_openzap/mod_openzap.$(DYNAMIC_LIB_EXTEN) ] ; then cd mod_openzap && make clean ; fi @if [ -f mod_openzap/mod_openzap.so ] ; then cd mod_openzap && make clean ; fi
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(PREFIX) $(mkinstalldirs) $(DESTDIR)$(PREFIX)

11
libs/openzap/configure.ac
View File

@ -105,22 +105,11 @@ else
AC_ERROR([Please update configure.in with SOLINK values for your compiler]) AC_ERROR([Please update configure.in with SOLINK values for your compiler])
fi fi
# set DYNAMIC_LIB_EXTEN
# we should really be using libtool so we don't need to do this
case "$host" in
*cygwin* | *mingw*)
DYNAMIC_LIB_EXTEN="dll"
;;
*)
DYNAMIC_LIB_EXTEN="so"
;;
esac
DEFAULT_INCLUDES="-I. -I./src/include -I$(srcdir)" DEFAULT_INCLUDES="-I. -I./src/include -I$(srcdir)"
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DEFAULT_INCLUDES) AC_SUBST(DEFAULT_INCLUDES)
AC_SUBST(DYNAMIC_LIB_EXTEN)
AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([pthread], [pthread_create])

7
libs/srtp/configure.ac
View File

@ -54,7 +54,6 @@ case "$host" in
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
IN_LINE=inline IN_LINE=inline
fi fi
DYNAMIC_LIB_EXTEN="so"
;; ;;
*-darwin*) *-darwin*)
if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
@ -62,7 +61,6 @@ case "$host" in
new_AM_CFLAGS="-DMACOSX" new_AM_CFLAGS="-DMACOSX"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="dylib"
;; ;;
x86_64-*-linux-gnu) x86_64-*-linux-gnu)
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
@ -75,7 +73,6 @@ case "$host" in
new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="so"
;; ;;
i*6-*-linux-gnu) i*6-*-linux-gnu)
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
@ -88,19 +85,16 @@ case "$host" in
new_AM_CFLAGS="-fpic -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_CFLAGS="-fpic -Wall -O4 -fexpensive-optimizations -funroll-loops"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
fi fi
DYNAMIC_LIB_EXTEN="so"
;; ;;
i*6*-*-freebsd*) i*6*-*-freebsd*)
SOLINK="-shared -Xlinker -x" SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
DYNAMIC_LIB_EXTEN="so"
;; ;;
x86_64-*-freebsd*|amd64-*-freebsd*) x86_64-*-freebsd*|amd64-*-freebsd*)
SOLINK="-shared -Xlinker -x" SOLINK="-shared -Xlinker -x"
new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops"
new_AM_LDFLAGS="" new_AM_LDFLAGS=""
DYNAMIC_LIB_EXTEN="so"
;; ;;
esac esac
@ -117,7 +111,6 @@ fi
AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_CFLAGS)
AC_SUBST(new_AM_LDFLAGS) AC_SUBST(new_AM_LDFLAGS)
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN)
if test "x$FUNC_DEF" != "x"; then if test "x$FUNC_DEF" != "x"; then
AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)])
fi fi