js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some fixes for Windows.

Browse source
This commit is contained in:
Jonathan Schleifer 2007-09-22 00:54:09 +02:00
parent 922797e526
commit ce5329a93b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
buildsys.mk.in
View file

@ -46,6 +46,7 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
INSTALL_LIB = @INSTALL_LIB@ INSTALL_LIB = @INSTALL_LIB@
UNINSTALL_LIB = @UNINSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@
CLEAN_LIB = @CLEAN_LIB@
LN_S = @LN_S@ LN_S = @LN_S@
MKDIR_P = mkdir -p MKDIR_P = mkdir -p
INSTALL = @INSTALL@ INSTALL = @INSTALL@
@ -339,7 +340,7 @@ clean:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${OBJS} ${CLEAN} .deps *~; do \ for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps *~; do \
if [ -f $$i -o -d $$i ]; then \ if [ -f $$i -o -d $$i ]; then \
if rm -fr $$i; then \ if rm -fr $$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \

14
m4/sharedlib.m4
View file

@ -34,6 +34,7 @@ AC_DEFUN([AM_SHARED_LIB], [
PLUGIN_SUFFIX='.impl' PLUGIN_SUFFIX='.impl'
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'
CLEAN_LIB=''
;; ;;
*-apple-*) *-apple-*)
AC_MSG_RESULT(Mac OS X) AC_MSG_RESULT(Mac OS X)
@ -48,6 +49,7 @@ AC_DEFUN([AM_SHARED_LIB], [
PLUGIN_SUFFIX='.impl' PLUGIN_SUFFIX='.impl'
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'
CLEAN_LIB=''
;; ;;
*-sun-* | *-openbsd-* | *-mirbsd-*) *-sun-* | *-openbsd-* | *-mirbsd-*)
AC_MSG_RESULT(Solaris) AC_MSG_RESULT(Solaris)
@ -62,20 +64,22 @@ AC_DEFUN([AM_SHARED_LIB], [
PLUGIN_SUFFIX='.so' PLUGIN_SUFFIX='.so'
INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && ${LN_S} -f $$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}'
CLEAN_LIB=''
;; ;;
*-*-mingw32) *-*-mingw32)
AC_MSG_RESULT(MinGW32) AC_MSG_RESULT(MinGW32)
LIB_CPPFLAGS='-DPIC' LIB_CPPFLAGS='-DPIC'
LIB_CFLAGS='' LIB_CFLAGS=''
LIB_LDFLAGS='-shared' LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a'
LIB_PREFIX='' LIB_PREFIX='lib'
LIB_SUFFIX='.dll' LIB_SUFFIX='.dll'
PLUGIN_CPPFLAGS='' PLUGIN_CPPFLAGS=''
PLUGIN_CFLAGS='' PLUGIN_CFLAGS=''
PLUGIN_LDFLAGS='' PLUGIN_LDFLAGS=''
PLUGIN_SUFFIX='.dll' PLUGIN_SUFFIX='.dll'
INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
CLEAN_LIB='${LIB}.a'
;; ;;
*) *)
AC_MSG_RESULT(POSIX) AC_MSG_RESULT(POSIX)
@ -90,6 +94,7 @@ AC_DEFUN([AM_SHARED_LIB], [
PLUGIN_SUFFIX='.so' PLUGIN_SUFFIX='.so'
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'
CLEAN_LIB=''
;; ;;
esac esac
@ -104,4 +109,5 @@ AC_DEFUN([AM_SHARED_LIB], [
AC_SUBST(PLUGIN_SUFFIX) AC_SUBST(PLUGIN_SUFFIX)
AC_SUBST(INSTALL_LIB) AC_SUBST(INSTALL_LIB)
AC_SUBST(UNINSTALL_LIB) AC_SUBST(UNINSTALL_LIB)
AC_SUBST(CLEAN_LIB)
]) ])