Skip to content

F
freeswitch
提交 55b3e6cb authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

simplify our configure and Makefile.am. Set our CFLAGS and LDFLAGS primarily from configure. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4512 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 76c6d4e3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 330 行增加 和 287 行删除
Makefile.am
浏览文件 @ 55b3e6cb
...@@ -4,20 +4,14 @@ AUTOMAKE_OPTS = gnu foreign ...@@ -4,20 +4,14 @@ AUTOMAKE_OPTS = gnu foreign
NAME=freeswitch NAME=freeswitch
PREFIX=$(prefix) PREFIX=$(prefix)
AM_CFLAGS = $(new_AM_CFLAGS) AM_CFLAGS = $(SWITCH_AM_CFLAGS)
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
AM_LDFLAGS = $(new_AM_LDFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
BASE = $(PWD) BASE = $(PWD)
OSARCH=$(shell uname -s) OSARCH=$(shell uname -s)
LIBTOOL=$(PWD)/libtool LIBTOOL=$(PWD)/libtool
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
FIRST_INCLUDES = -I$(PWD)/src/include -I$(PWD)
AM_CFLAGS += $(FIRST_INCLUDES) -I$(PREFIX)/include
AM_LDFLAGS += -L$(PREFIX)/lib
AM_LDFLAGS += -lm -L/usr/local/lib/db42 -L/usr/local/lib
if CRASHPROT if CRASHPROT
AM_CFLAGS += -DCRASH_PROT AM_CFLAGS += -DCRASH_PROT
endif endif
...@@ -72,36 +66,30 @@ src/include/switch_log.h\ ...@@ -72,36 +66,30 @@ src/include/switch_log.h\
src/include/switch_xml.h src/include/switch_xml.h
BUILT_SOURCES = version depends BUILT_SOURCES = version depends
CLEANFILES = src/include/switch_version.h scripts/fsxs CLEANFILES = src/include/switch_version.h
APR_CONFIG=$(PWD)/libs/apr/apr-1-config
APU_CONFIG=$(PWD)/libs/apr-util/apu-1-config
CORE_INCLUDES = -I$(PWD)/libs/apr/include CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes)
CORE_INCLUDES += -I$(PWD)/libs/apr-util/include CORE_CFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --includes)
CORE_INCLUDES += -I$(PWD)/libs/sqlite CORE_CFLAGS += -I$(PWD)/libs/sqlite
CORE_INCLUDES += -I$(PWD)/libs/pcre CORE_CFLAGS += -I$(PWD)/libs/pcre
CORE_INCLUDES += -I$(PWD)/libs/srtp/include CORE_CFLAGS += -I$(PWD)/libs/srtp/include
CORE_INCLUDES += -I$(PWD)/libs/srtp/crypto/include CORE_CFLAGS += -I$(PWD)/libs/srtp/crypto/include
CORE_INCLUDES += -I$(PWD)/libs/libresample/include CORE_CFLAGS += -I$(PWD)/libs/libresample/include
CORE_INCLUDES += -I$(PWD)/libs/libteletone/src CORE_CFLAGS += -I$(PWD)/libs/libteletone/src
CORE_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --link-ld --libs )
CORE_CFLAGS += $(shell $(APU_CONFIG) --includes) CORE_LDFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs )
CORE_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs )
CORE_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs )
lib_LTLIBRARIES = libfreeswitch.la lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(FIRST_INCLUDES) $(CORE_INCLUDES) $(AM_CFLAGS) $(CORE_CFLAGS) libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(CORE_LDFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(CORE_LDFLAGS) $(AM_LDFLAGS)
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
$(libfreeswitch_la_SOURCES): depends version $(libfreeswitch_la_SOURCES): depends version
bin_PROGRAMS = freeswitch bin_PROGRAMS = freeswitch
bin_SCRIPTS = scripts/fsxs
freeswitch_SOURCES = src/switch.c\ freeswitch_SOURCES = src/switch.c\
src/include/switch_version.h src/include/switch_version.h
freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS)
...@@ -201,27 +189,6 @@ install_mod: modules ...@@ -201,27 +189,6 @@ install_mod: modules
dox: dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf cd docs && doxygen $(PWD)/docs/Doxygen.conf
scripts/fsxs: scripts/fsxs.in
@echo creating fsxs
@sed -e "s,@MODULES_DIR\@,$(PREFIX)/mod," \
-e "s,@LIB_DIR\@,$(PREFIX)/lib," \
-e "s,@BIN_DIR\@,$(PREFIX)/bin," \
-e "s,@INC_DIR\@,$(PREFIX)/include," \
-e "s,@CFG_DIR\@,$(PREFIX)/conf," \
-e "s,@DB_DIR\@,$(PREFIX)/db," \
-e "s,@PREFIX\@,$(PREFIX)," \
-e "s,@CC\@,$(CC)," \
-e "s,@LD\@,$(CC)," \
-e "s,@INSTALL\@,$(INSTALL)," \
-e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \
\
-e "s|@CFLAGS\@|$(CFLAGS) $(shell $(APR_CONFIG) --cflags --cppflags)|" \
-e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \
-e "s|@SOLINK\@|$(SOLINK)|" \
-e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
-e "s|@LIBS\@|-lfreeswitch|" \
scripts/fsxs.in > scripts/fsxs
eclean: clean eclean: clean
rm -f `find . -type f -name \*~` rm -f `find . -type f -name \*~`
rm -f `find . -type f -name \.*~` rm -f `find . -type f -name \.*~`
......
Makefile.in
浏览文件 @ 55b3e6cb
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES)
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -79,7 +78,7 @@ am__vpath_adj = case $$p in \ ...@@ -79,7 +78,7 @@ am__vpath_adj = case $$p in \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)" "$(DESTDIR)$(library_includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL) libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libfreeswitch_la_DEPENDENCIES = libfreeswitch_la_DEPENDENCIES =
...@@ -107,8 +106,6 @@ PROGRAMS = $(bin_PROGRAMS) ...@@ -107,8 +106,6 @@ PROGRAMS = $(bin_PROGRAMS)
am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT) am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT)
freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) freeswitch_OBJECTS = $(am_freeswitch_OBJECTS)
freeswitch_DEPENDENCIES = ${top_builddir}/libfreeswitch.la freeswitch_DEPENDENCIES = ${top_builddir}/libfreeswitch.la
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
...@@ -208,6 +205,8 @@ SET_MAKE = @SET_MAKE@ ...@@ -208,6 +205,8 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SOLINK = @SOLINK@ SOLINK = @SOLINK@
STRIP = @STRIP@ STRIP = @STRIP@
SWITCH_AM_CFLAGS = @SWITCH_AM_CFLAGS@
SWITCH_AM_LDFLAGS = @SWITCH_AM_LDFLAGS@
VERSION = @VERSION@ VERSION = @VERSION@
WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@ WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@
WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@ WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@
...@@ -251,8 +250,6 @@ localstatedir = @localstatedir@ ...@@ -251,8 +250,6 @@ localstatedir = @localstatedir@
long_value = @long_value@ long_value = @long_value@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
new_AM_CFLAGS = @new_AM_CFLAGS@
new_AM_LDFLAGS = @new_AM_LDFLAGS@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
...@@ -263,6 +260,8 @@ size_t_fmt = @size_t_fmt@ ...@@ -263,6 +260,8 @@ size_t_fmt = @size_t_fmt@
size_t_value = @size_t_value@ size_t_value = @size_t_value@
ssize_t_fmt = @ssize_t_fmt@ ssize_t_fmt = @ssize_t_fmt@
ssize_t_value = @ssize_t_value@ ssize_t_value = @ssize_t_value@
switch_builddir = @switch_builddir@
switch_srcdir = @switch_srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
uint64_t_fmt = @uint64_t_fmt@ uint64_t_fmt = @uint64_t_fmt@
...@@ -272,15 +271,12 @@ SUBDIRS = ...@@ -272,15 +271,12 @@ SUBDIRS =
AUTOMAKE_OPTS = gnu foreign AUTOMAKE_OPTS = gnu foreign
NAME = freeswitch NAME = freeswitch
PREFIX = $(prefix) PREFIX = $(prefix)
AM_CFLAGS = $(new_AM_CFLAGS) $(FIRST_INCLUDES) -I$(PREFIX)/include \ AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1)
$(am__append_1)
AM_CPPFLAGS = $(AM_CFLAGS) AM_CPPFLAGS = $(AM_CFLAGS)
AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(PREFIX)/lib -lm \ AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
-L/usr/local/lib/db42 -L/usr/local/lib
BASE = $(PWD) BASE = $(PWD)
OSARCH = $(shell uname -s) OSARCH = $(shell uname -s)
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
FIRST_INCLUDES = -I$(PWD)/src/include -I$(PWD)
libfreeswitch_la_SOURCES = \ libfreeswitch_la_SOURCES = \
src/switch_apr.c \ src/switch_apr.c \
src/switch_buffer.c \ src/switch_buffer.c \
...@@ -330,25 +326,22 @@ src/include/switch_log.h\ ...@@ -330,25 +326,22 @@ src/include/switch_log.h\
src/include/switch_xml.h src/include/switch_xml.h
BUILT_SOURCES = version depends BUILT_SOURCES = version depends
CLEANFILES = src/include/switch_version.h scripts/fsxs CLEANFILES = src/include/switch_version.h
APR_CONFIG = $(PWD)/libs/apr/apr-1-config CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags \
APU_CONFIG = $(PWD)/libs/apr-util/apu-1-config --cppflags --includes) $(shell \
CORE_INCLUDES = -I$(PWD)/libs/apr/include \ $(switch_srcdir)/libs/apr-util/apu-1-config --includes) \
-I$(PWD)/libs/apr-util/include -I$(PWD)/libs/sqlite \ -I$(PWD)/libs/sqlite -I$(PWD)/libs/pcre \
-I$(PWD)/libs/pcre -I$(PWD)/libs/srtp/include \ -I$(PWD)/libs/srtp/include -I$(PWD)/libs/srtp/crypto/include \
-I$(PWD)/libs/srtp/crypto/include \
-I$(PWD)/libs/libresample/include \ -I$(PWD)/libs/libresample/include \
-I$(PWD)/libs/libteletone/src -I$(PWD)/libs/libteletone/src
CORE_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \ CORE_LDFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config \
$(shell $(APU_CONFIG) --includes) --link-ld --libs ) $(shell \
CORE_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(shell \ $(switch_srcdir)/libs/apr-util/apu-1-config --link-ld --libs )
$(APU_CONFIG) --link-ld --libs )
lib_LTLIBRARIES = libfreeswitch.la lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(FIRST_INCLUDES) $(CORE_INCLUDES) $(AM_CFLAGS) $(CORE_CFLAGS) libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(CORE_LDFLAGS) libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(CORE_LDFLAGS) $(AM_LDFLAGS)
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_SCRIPTS = scripts/fsxs
freeswitch_SOURCES = src/switch.c\ freeswitch_SOURCES = src/switch.c\
src/include/switch_version.h src/include/switch_version.h
...@@ -473,25 +466,6 @@ clean-binPROGRAMS: ...@@ -473,25 +466,6 @@ clean-binPROGRAMS:
freeswitch$(EXEEXT): $(freeswitch_OBJECTS) $(freeswitch_DEPENDENCIES) freeswitch$(EXEEXT): $(freeswitch_OBJECTS) $(freeswitch_DEPENDENCIES)
@rm -f freeswitch$(EXEEXT) @rm -f freeswitch$(EXEEXT)
$(LINK) $(freeswitch_LDFLAGS) $(freeswitch_OBJECTS) $(freeswitch_LDADD) $(LIBS) $(LINK) $(freeswitch_LDFLAGS) $(freeswitch_OBJECTS) $(freeswitch_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
$(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
...@@ -972,12 +946,12 @@ distcleancheck: distclean ...@@ -972,12 +946,12 @@ distcleancheck: distclean
check-am: all-am check-am: all-am
check: $(BUILT_SOURCES) check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
install-binPROGRAMS: install-libLTLIBRARIES install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: $(BUILT_SOURCES) install: $(BUILT_SOURCES)
...@@ -1031,8 +1005,7 @@ info-am: ...@@ -1031,8 +1005,7 @@ info-am:
install-data-am: install-library_includeHEADERS install-data-am: install-library_includeHEADERS
install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
install-libLTLIBRARIES
install-info: install-info-recursive install-info: install-info-recursive
...@@ -1060,9 +1033,8 @@ ps: ps-recursive ...@@ -1060,9 +1033,8 @@ ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
uninstall-library_includeHEADERS
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
...@@ -1074,16 +1046,16 @@ uninstall-info: uninstall-info-recursive ...@@ -1074,16 +1046,16 @@ uninstall-info: uninstall-info-recursive
distclean-generic distclean-hdr distclean-libtool \ distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \ distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \ distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-binSCRIPTS \ install install-am install-binPROGRAMS install-data \
install-data install-data-am install-exec install-exec-am \ install-data-am install-exec install-exec-am install-info \
install-info install-info-am install-libLTLIBRARIES \ install-info-am install-libLTLIBRARIES \
install-library_includeHEADERS install-man install-strip \ install-library_includeHEADERS install-man install-strip \
installcheck installcheck-am installdirs installdirs-am \ installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic \ maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \ uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-library_includeHEADERS uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
...@@ -1182,27 +1154,6 @@ install_mod: modules ...@@ -1182,27 +1154,6 @@ install_mod: modules
dox: dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf cd docs && doxygen $(PWD)/docs/Doxygen.conf
scripts/fsxs: scripts/fsxs.in
@echo creating fsxs
@sed -e "s,@MODULES_DIR\@,$(PREFIX)/mod," \
-e "s,@LIB_DIR\@,$(PREFIX)/lib," \
-e "s,@BIN_DIR\@,$(PREFIX)/bin," \
-e "s,@INC_DIR\@,$(PREFIX)/include," \
-e "s,@CFG_DIR\@,$(PREFIX)/conf," \
-e "s,@DB_DIR\@,$(PREFIX)/db," \
-e "s,@PREFIX\@,$(PREFIX)," \
-e "s,@CC\@,$(CC)," \
-e "s,@LD\@,$(CC)," \
-e "s,@INSTALL\@,$(INSTALL)," \
-e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \
\
-e "s|@CFLAGS\@|$(CFLAGS) $(shell $(APR_CONFIG) --cflags --cppflags)|" \
-e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \
-e "s|@SOLINK\@|$(SOLINK)|" \
-e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
-e "s|@LIBS\@|-lfreeswitch|" \
scripts/fsxs.in > scripts/fsxs
eclean: clean eclean: clean
rm -f `find . -type f -name \*~` rm -f `find . -type f -name \*~`
rm -f `find . -type f -name \.*~` rm -f `find . -type f -name \.*~`
......
configure
浏览文件 @ 55b3e6cb
差异被折叠。
configure.in
浏览文件 @ 55b3e6cb
...@@ -8,9 +8,16 @@ AM_INIT_AUTOMAKE(libfreeswitch,0.1) ...@@ -8,9 +8,16 @@ AM_INIT_AUTOMAKE(libfreeswitch,0.1)
AC_CONFIG_SRCDIR([src/switch.c]) AC_CONFIG_SRCDIR([src/switch.c])
AC_CONFIG_HEADER([src/include/switch_private.h]) AC_CONFIG_HEADER([src/include/switch_private.h])
AC_PREFIX_DEFAULT(/usr/local/freeswitch) AC_PREFIX_DEFAULT(/usr/local/freeswitch)
dnl Setup the directory macros now
# Absolute source/build directory
switch_srcdir=`(cd $srcdir && pwd)`
switch_builddir=`pwd`
AC_SUBST(switch_srcdir)
AC_SUBST(switch_builddir)
#Set default language #Set default language
AC_LANG_C AC_LANG_C
# Checks for programs. # Checks for programs.
...@@ -43,76 +50,64 @@ fi ...@@ -43,76 +50,64 @@ fi
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
# set defaults for use on all platforms
SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir} -I${prefix}/include"
SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib/db42 -L/usr/local/lib"
#set SOLINK variable based on compiler and host
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
SOLINK="-Bdynamic -dy -G"
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
case "$host" in
*-darwin*)
SOLINK="-dynamic -bundle -force-flat-namespace"
;;
*)
SOLINK="-shared -Xlinker -x"
;;
esac
else
AC_ERROR([Please update configure.in with SOLINK values for your compiler])
fi
# set DYNAMIC_LIB_EXTEN
# we should really be using libtool so we don't need to do this
case "$host" in
*-darwin*)
DYNAMIC_LIB_EXTEN="dylib"
;;
*cygwin* | *mingw*)
DYNAMIC_LIB_EXTEN="dll"
;;
*)
DYNAMIC_LIB_EXTEN="so"
;;
esac
# tweak compiler specific flags
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)
APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC)
APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib)
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
fi
# tweak platform specific flags
case "$host" in case "$host" in
*-solaris2*) *-darwin*)
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
new_AM_CFLAGS="-DPATH_MAX=2048 -KPIC -DPIC" APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC)
new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" ;;
IN_LINE="" *-solaris2*)
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048)
new_AM_CFLAGS="-DPATH_MAX=2048 -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"
IN_LINE=inline
;;
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"
IN_LINE=inline
;;
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
IN_LINE=inline
DYNAMIC_LIB_EXTEN="so"
;;
*)
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"
IN_LINE=inline
;;
esac esac
AC_SUBST(new_AM_CFLAGS)
AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SWITCH_AM_CFLAGS)
AC_SUBST(SWITCH_AM_LDFLAGS)
AC_SUBST(SOLINK) AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN) 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.
AC_HEADER_DIRENT AC_HEADER_DIRENT
......
src/include/switch_private.h.in
浏览文件 @ 55b3e6cb
...@@ -136,9 +136,6 @@ ...@@ -136,9 +136,6 @@
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION
/* sunpro is bad at inline */
#undef __inline__
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
#undef const #undef const
......
src/switch.c
浏览文件 @ 55b3e6cb
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
* *
*/ */
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 500
#endif
#include <switch.h> #include <switch.h>
/* pid filename: Stores the process id of the freeswitch process */ /* pid filename: Stores the process id of the freeswitch process */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论