ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update buildsys

Browse source
This commit is contained in:
Jonathan Schleifer 2016-07-09 22:12:09 +02:00
parent 24e8ee8a50
commit b145493526
No known key found for this signature in database
GPG key ID: 338C3541DB54E169
2 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
buildsys.mk.in
View file

@ -1,8 +1,8 @@
# #
# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 # Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
# Jonathan Schleifer <js@webkeks.org> # Jonathan Schleifer <js@heap.zone>
# #
# https://webkeks.org/git/?p=buildsys.git # https://heap.zone/git/?p=buildsys.git
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@ -114,10 +114,10 @@ MO_FILES = ${LOCALES:.po=.mo}
all: all:
${MAKE} pre-all ${MAKE} pre-all
${MAKE} ${MFLAGS} subdirs ${MAKE} subdirs
${MAKE} ${MFLAGS} depend ${MAKE} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
${MAKE} ${MFLAGS} subdirs-after ${MAKE} subdirs-after
${MAKE} post-all ${MAKE} post-all
pre-all post-all: pre-all post-all:
@ -128,7 +128,7 @@ subdirs-after: ${SUBDIRS_AFTER}
${SUBDIRS} ${SUBDIRS_AFTER}: ${SUBDIRS} ${SUBDIRS_AFTER}:
for i in $@; do \ for i in $@; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} || exit $$?; \ ${MAKE} || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -172,7 +172,7 @@ depend: pre-depend ${SRCS}
done; \ done; \
if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
${DEPEND_STATUS}; \ ${DEPEND_STATUS}; \
if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ if ${MAKE} $$deps && cat $$deps >.deps; then \
rm -f $$deps; \ rm -f $$deps; \
${DEPEND_OK}; \ ${DEPEND_OK}; \
else \ else \
@ -623,7 +623,7 @@ locales: ${MO_FILES}
install: all install-extra install: all install-extra
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} install || exit $$?; \ ${MAKE} install || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -704,7 +704,7 @@ install-extra:
uninstall: uninstall-extra uninstall: uninstall-extra
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} uninstall || exit $$?; \ ${MAKE} uninstall || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -797,7 +797,7 @@ uninstall-extra:
clean: clean:
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} clean || exit $$?; \ ${MAKE} clean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -814,7 +814,7 @@ clean:
distclean: clean distclean: clean
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} distclean || exit $$?; \ ${MAKE} distclean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -832,7 +832,7 @@ print-hierarchy:
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \ echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \ cd $$i || exit $$?; \
${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \ ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
cd .. || exit $$?; \ cd .. || exit $$?; \
done done

20
m4/buildsys.m4
View file

@ -1,8 +1,8 @@
dnl dnl
dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016
dnl Jonathan Schleifer <js@webkeks.org> dnl Jonathan Schleifer <js@heap.zone>
dnl dnl
dnl https://webkeks.org/git/?p=buildsys.git dnl https://heap.zone/git/?p=buildsys.git
dnl dnl
dnl Permission to use, copy, modify, and/or distribute this software for any dnl Permission to use, copy, modify, and/or distribute this software for any
dnl purpose with or without fee is hereby granted, provided that the above dnl purpose with or without fee is hereby granted, provided that the above
@ -174,6 +174,20 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
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='' CLEAN_LIB=''
;; ;;
*-android*)
AC_MSG_RESULT(Android)
LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
LIB_PREFIX='lib'
LIB_SUFFIX='.so'
LDFLAGS_RPATH=''
PLUGIN_CFLAGS='-fPIC -DPIC'
PLUGIN_LDFLAGS='-shared'
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'
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
CLEAN_LIB=''
;;
*) *)
AC_MSG_RESULT(ELF) AC_MSG_RESULT(ELF)
LIB_CFLAGS='-fPIC -DPIC' LIB_CFLAGS='-fPIC -DPIC'