Style change: Don't indent cases
FossilOrigin-Name: 8bd9a9831b530887ada806b1e4780d7de929f9e17c2de9806b194a8fdec1ce8c
This commit is contained in:
parent
766a8158c0
commit
c1c320628c
2 changed files with 183 additions and 185 deletions
|
|
@ -27,13 +27,13 @@ AC_DEFUN([BUILDSYS_INIT], [
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
|
||||||
case "$build_os" in
|
case "$build_os" in
|
||||||
|
darwin*)
|
||||||
|
case "$host_os" in
|
||||||
darwin*)
|
darwin*)
|
||||||
case "$host_os" in
|
AC_SUBST(BUILD_AND_HOST_ARE_DARWIN, yes)
|
||||||
darwin*)
|
|
||||||
AC_SUBST(BUILD_AND_HOST_ARE_DARWIN, yes)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_CONFIG_COMMANDS_PRE([
|
AC_CONFIG_COMMANDS_PRE([
|
||||||
|
|
@ -50,16 +50,15 @@ AC_DEFUN([BUILDSYS_INIT], [
|
||||||
AC_SUBST(AMIGA_LIB_LDFLAGS)
|
AC_SUBST(AMIGA_LIB_LDFLAGS)
|
||||||
|
|
||||||
case "$build_os" in
|
case "$build_os" in
|
||||||
morphos*)
|
morphos*)
|
||||||
dnl Don't use tput on MorphOS: The colored
|
dnl Don't use tput on MorphOS: The colored output is
|
||||||
dnl output is quite unreadable and in some
|
dnl quite unreadable and in some MorphOS versions the
|
||||||
dnl MorphOS versions, the output from tput is
|
dnl output from tput is not 8-bit safe, with awk (for
|
||||||
dnl not 8-bit safe, with awk (for AC_SUBST)
|
dnl AC_SUBST) failing as a result.
|
||||||
dnl failing as a result.
|
;;
|
||||||
;;
|
*)
|
||||||
*)
|
AC_PATH_PROG(TPUT, tput)
|
||||||
AC_PATH_PROG(TPUT, tput)
|
;;
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AS_IF([test x"$TPUT" != x""], [
|
AS_IF([test x"$TPUT" != x""], [
|
||||||
|
|
@ -123,24 +122,23 @@ AC_DEFUN([BUILDSYS_INIT], [
|
||||||
|
|
||||||
AC_DEFUN([BUILDSYS_CHECK_IOS], [
|
AC_DEFUN([BUILDSYS_CHECK_IOS], [
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
darwin*)
|
darwin*)
|
||||||
AC_MSG_CHECKING(whether host is iOS)
|
AC_MSG_CHECKING(whether host is iOS)
|
||||||
AC_EGREP_CPP(yes, [
|
AC_EGREP_CPP(yes, [
|
||||||
#include <TargetConditionals.h>
|
#include <TargetConditionals.h>
|
||||||
|
|
||||||
#if (defined(TARGET_OS_IPHONE) && \
|
#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
|
||||||
TARGET_OS_IPHONE) || \
|
(defined(TARGET_OS_SIMULATOR) && \
|
||||||
(defined(TARGET_OS_SIMULATOR) && \
|
TARGET_OS_SIMULATOR)
|
||||||
TARGET_OS_SIMULATOR)
|
yes
|
||||||
yes
|
#endif
|
||||||
#endif
|
], [
|
||||||
], [
|
host_is_ios="yes"
|
||||||
host_is_ios="yes"
|
], [
|
||||||
], [
|
host_is_ios="no"
|
||||||
host_is_ios="no"
|
])
|
||||||
])
|
AC_MSG_RESULT($host_is_ios)
|
||||||
AC_MSG_RESULT($host_is_ios)
|
;;
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
@ -148,16 +146,16 @@ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
AC_MSG_CHECKING(whether we need an implib)
|
AC_MSG_CHECKING(whether we need an implib)
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
cygwin* | mingw*)
|
cygwin* | mingw*)
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
PROG_IMPLIB_NEEDED='yes'
|
PROG_IMPLIB_NEEDED='yes'
|
||||||
PROG_IMPLIB_LDFLAGS='-Wl,--export-all-symbols,--out-implib,lib${PROG}.a'
|
PROG_IMPLIB_LDFLAGS='-Wl,--export-all-symbols,--out-implib,lib${PROG}.a'
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
PROG_IMPLIB_NEEDED='no'
|
PROG_IMPLIB_NEEDED='no'
|
||||||
PROG_IMPLIB_LDFLAGS=''
|
PROG_IMPLIB_LDFLAGS=''
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_SUBST(PROG_IMPLIB_NEEDED)
|
AC_SUBST(PROG_IMPLIB_NEEDED)
|
||||||
|
|
@ -170,118 +168,118 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
|
||||||
AC_MSG_CHECKING(for shared library system)
|
AC_MSG_CHECKING(for shared library system)
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
darwin*)
|
darwin*)
|
||||||
AC_MSG_RESULT(Darwin)
|
AC_MSG_RESULT(Darwin)
|
||||||
LIB_CFLAGS='-fPIC -DPIC'
|
LIB_CFLAGS='-fPIC -DPIC'
|
||||||
LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
||||||
LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
|
LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
|
||||||
LIB_PREFIX='lib'
|
LIB_PREFIX='lib'
|
||||||
LIB_SUFFIX='.dylib'
|
LIB_SUFFIX='.dylib'
|
||||||
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
||||||
PLUGIN_CFLAGS='-fPIC -DPIC'
|
PLUGIN_CFLAGS='-fPIC -DPIC'
|
||||||
PLUGIN_LDFLAGS='-bundle ${PLUGIN_LDFLAGS_BUNDLE_LOADER}'
|
PLUGIN_LDFLAGS='-bundle ${PLUGIN_LDFLAGS_BUNDLE_LOADER}'
|
||||||
PLUGIN_SUFFIX='.bundle'
|
PLUGIN_SUFFIX='.bundle'
|
||||||
AS_IF([test x"$host_is_ios" = x"yes"], [
|
AS_IF([test x"$host_is_ios" = x"yes"], [
|
||||||
LINK_PLUGIN='rm -fr $$out && ${MKDIR_P} $$out && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && ${LD} -o $$out/$${out%${PLUGIN_SUFFIX}} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out'
|
LINK_PLUGIN='rm -fr $$out && ${MKDIR_P} $$out && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && ${LD} -o $$out/$${out%${PLUGIN_SUFFIX}} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out'
|
||||||
], [
|
], [
|
||||||
LINK_PLUGIN='rm -fr $$out && ${MKDIR_P} $$out/Contents/MacOS && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Contents/Info.plist; fi && ${LD} -o $$out/Contents/MacOS/$${out%${PLUGIN_SUFFIX}} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out'
|
LINK_PLUGIN='rm -fr $$out && ${MKDIR_P} $$out/Contents/MacOS && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Contents/Info.plist; fi && ${LD} -o $$out/Contents/MacOS/$${out%${PLUGIN_SUFFIX}} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out'
|
||||||
])
|
])
|
||||||
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
|
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
|
||||||
INSTALL_PLUGIN='&& rm -fr ${DESTDIR}${plugindir}/$$i && cp -R $$i ${DESTDIR}${plugindir}/'
|
INSTALL_PLUGIN='&& rm -fr ${DESTDIR}${plugindir}/$$i && cp -R $$i ${DESTDIR}${plugindir}/'
|
||||||
UNINSTALL_PLUGIN='&& rm -fr ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -fr ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB=''
|
CLEAN_LIB=''
|
||||||
;;
|
;;
|
||||||
mingw* | cygwin*)
|
mingw* | cygwin*)
|
||||||
AC_MSG_RESULT(MinGW / Cygwin)
|
AC_MSG_RESULT(MinGW / Cygwin)
|
||||||
LIB_CFLAGS=''
|
LIB_CFLAGS=''
|
||||||
LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib${SHARED_LIB}.a'
|
LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,lib${SHARED_LIB}.a'
|
||||||
LIB_LDFLAGS_INSTALL_NAME=''
|
LIB_LDFLAGS_INSTALL_NAME=''
|
||||||
LIB_PREFIX=''
|
LIB_PREFIX=''
|
||||||
LIB_SUFFIX='.dll'
|
LIB_SUFFIX='.dll'
|
||||||
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
||||||
PLUGIN_CFLAGS=''
|
PLUGIN_CFLAGS=''
|
||||||
PLUGIN_LDFLAGS='-shared'
|
PLUGIN_LDFLAGS='-shared'
|
||||||
PLUGIN_SUFFIX='.dll'
|
PLUGIN_SUFFIX='.dll'
|
||||||
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
||||||
INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 lib$$i.a ${DESTDIR}${libdir}/lib$$i.a'
|
INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 lib$$i.a ${DESTDIR}${libdir}/lib$$i.a'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/lib$$i.a'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/lib$$i.a'
|
||||||
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
||||||
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB='${SHARED_LIB}.a'
|
CLEAN_LIB='${SHARED_LIB}.a'
|
||||||
;;
|
;;
|
||||||
openbsd* | mirbsd*)
|
openbsd* | mirbsd*)
|
||||||
AC_MSG_RESULT(OpenBSD)
|
AC_MSG_RESULT(OpenBSD)
|
||||||
LIB_CFLAGS='-fPIC -DPIC'
|
LIB_CFLAGS='-fPIC -DPIC'
|
||||||
LIB_LDFLAGS='-shared'
|
LIB_LDFLAGS='-shared'
|
||||||
LIB_LDFLAGS_INSTALL_NAME=''
|
LIB_LDFLAGS_INSTALL_NAME=''
|
||||||
LIB_PREFIX='lib'
|
LIB_PREFIX='lib'
|
||||||
LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
|
LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
|
||||||
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
||||||
PLUGIN_CFLAGS='-fPIC -DPIC'
|
PLUGIN_CFLAGS='-fPIC -DPIC'
|
||||||
PLUGIN_LDFLAGS='-shared'
|
PLUGIN_LDFLAGS='-shared'
|
||||||
PLUGIN_SUFFIX='.so'
|
PLUGIN_SUFFIX='.so'
|
||||||
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
||||||
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
|
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
|
||||||
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
||||||
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB=''
|
CLEAN_LIB=''
|
||||||
;;
|
;;
|
||||||
solaris*)
|
solaris*)
|
||||||
AC_MSG_RESULT(Solaris)
|
AC_MSG_RESULT(Solaris)
|
||||||
LIB_CFLAGS='-fPIC -DPIC'
|
LIB_CFLAGS='-fPIC -DPIC'
|
||||||
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
|
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
|
||||||
LIB_LDFLAGS_INSTALL_NAME=''
|
LIB_LDFLAGS_INSTALL_NAME=''
|
||||||
LIB_PREFIX='lib'
|
LIB_PREFIX='lib'
|
||||||
LIB_SUFFIX='.so'
|
LIB_SUFFIX='.so'
|
||||||
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
||||||
PLUGIN_CFLAGS='-fPIC -DPIC'
|
PLUGIN_CFLAGS='-fPIC -DPIC'
|
||||||
PLUGIN_LDFLAGS='-shared'
|
PLUGIN_LDFLAGS='-shared'
|
||||||
PLUGIN_SUFFIX='.so'
|
PLUGIN_SUFFIX='.so'
|
||||||
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
||||||
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
|
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
|
||||||
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
||||||
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB=''
|
CLEAN_LIB=''
|
||||||
;;
|
;;
|
||||||
*-android*)
|
*-android*)
|
||||||
AC_MSG_RESULT(Android)
|
AC_MSG_RESULT(Android)
|
||||||
LIB_CFLAGS='-fPIC -DPIC'
|
LIB_CFLAGS='-fPIC -DPIC'
|
||||||
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
|
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
|
||||||
LIB_LDFLAGS_INSTALL_NAME=''
|
LIB_LDFLAGS_INSTALL_NAME=''
|
||||||
LIB_PREFIX='lib'
|
LIB_PREFIX='lib'
|
||||||
LIB_SUFFIX='.so'
|
LIB_SUFFIX='.so'
|
||||||
LDFLAGS_RPATH=''
|
LDFLAGS_RPATH=''
|
||||||
PLUGIN_CFLAGS='-fPIC -DPIC'
|
PLUGIN_CFLAGS='-fPIC -DPIC'
|
||||||
PLUGIN_LDFLAGS='-shared'
|
PLUGIN_LDFLAGS='-shared'
|
||||||
PLUGIN_SUFFIX='.so'
|
PLUGIN_SUFFIX='.so'
|
||||||
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
||||||
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
|
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
|
||||||
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
||||||
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB=''
|
CLEAN_LIB=''
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_RESULT(ELF)
|
AC_MSG_RESULT(ELF)
|
||||||
LIB_CFLAGS='-fPIC -DPIC'
|
LIB_CFLAGS='-fPIC -DPIC'
|
||||||
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
|
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
|
||||||
LIB_LDFLAGS_INSTALL_NAME=''
|
LIB_LDFLAGS_INSTALL_NAME=''
|
||||||
LIB_PREFIX='lib'
|
LIB_PREFIX='lib'
|
||||||
LIB_SUFFIX='.so'
|
LIB_SUFFIX='.so'
|
||||||
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
|
||||||
PLUGIN_CFLAGS='-fPIC -DPIC'
|
PLUGIN_CFLAGS='-fPIC -DPIC'
|
||||||
PLUGIN_LDFLAGS='-shared'
|
PLUGIN_LDFLAGS='-shared'
|
||||||
PLUGIN_SUFFIX='.so'
|
PLUGIN_SUFFIX='.so'
|
||||||
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
LINK_PLUGIN='${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
|
||||||
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
|
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
|
||||||
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
|
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
|
||||||
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
INSTALL_PLUGIN='&& ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i'
|
||||||
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
UNINSTALL_PLUGIN='&& rm -f ${DESTDIR}${plugindir}/$$i'
|
||||||
CLEAN_LIB=''
|
CLEAN_LIB=''
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_SUBST(LIB_CFLAGS)
|
AC_SUBST(LIB_CFLAGS)
|
||||||
|
|
@ -309,20 +307,20 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
|
||||||
AC_CHECK_TOOL(CODESIGN, codesign)
|
AC_CHECK_TOOL(CODESIGN, codesign)
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
darwin*)
|
darwin*)
|
||||||
AS_IF([test x"$host_is_ios" = x"yes"], [
|
AS_IF([test x"$host_is_ios" = x"yes"], [
|
||||||
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
||||||
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'
|
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'
|
||||||
], [
|
], [
|
||||||
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
|
||||||
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
|
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_SUBST(FRAMEWORK_LDFLAGS)
|
AC_SUBST(FRAMEWORK_LDFLAGS)
|
||||||
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
|
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
|
||||||
AC_SUBST(FRAMEWORK_LIBS)
|
AC_SUBST(FRAMEWORK_LIBS)
|
||||||
|
|
||||||
$1
|
$1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
|
|
|
||||||
|
|
@ -249,12 +249,12 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
|
||||||
ars=""; \
|
ars=""; \
|
||||||
for i in ${OBJS} ${OBJS_EXTRA}; do \
|
for i in ${OBJS} ${OBJS_EXTRA}; do \
|
||||||
case $$i in \
|
case $$i in \
|
||||||
*.a) \
|
*.a) \
|
||||||
ars="$$ars $$i" \
|
ars="$$ars $$i" \
|
||||||
;; \
|
;; \
|
||||||
*.o) \
|
*.o) \
|
||||||
objs="$$objs $$i" \
|
objs="$$objs $$i" \
|
||||||
;; \
|
;; \
|
||||||
esac \
|
esac \
|
||||||
done; \
|
done; \
|
||||||
for i in $$ars; do \
|
for i in $$ars; do \
|
||||||
|
|
@ -296,12 +296,12 @@ ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_E
|
||||||
ars=""; \
|
ars=""; \
|
||||||
for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
|
for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
|
||||||
case $$i in \
|
case $$i in \
|
||||||
*.a) \
|
*.a) \
|
||||||
ars="$$ars $$i" \
|
ars="$$ars $$i" \
|
||||||
;; \
|
;; \
|
||||||
*.o) \
|
*.o) \
|
||||||
objs="$$objs $$i" \
|
objs="$$objs $$i" \
|
||||||
;; \
|
;; \
|
||||||
esac \
|
esac \
|
||||||
done; \
|
done; \
|
||||||
for i in $$ars; do \
|
for i in $$ars; do \
|
||||||
|
|
@ -335,12 +335,12 @@ ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS} ${
|
||||||
ars=""; \
|
ars=""; \
|
||||||
for i in ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}; do \
|
for i in ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}; do \
|
||||||
case $$i in \
|
case $$i in \
|
||||||
*.a) \
|
*.a) \
|
||||||
ars="$$ars $$i" \
|
ars="$$ars $$i" \
|
||||||
;; \
|
;; \
|
||||||
*.o) \
|
*.o) \
|
||||||
objs="$$objs $$i" \
|
objs="$$objs $$i" \
|
||||||
;; \
|
;; \
|
||||||
esac \
|
esac \
|
||||||
done; \
|
done; \
|
||||||
for i in $$ars; do \
|
for i in $$ars; do \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue