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 2018-01-21 23:31:42 +01:00
parent 50c2fd9612
commit 8e0deb6a64
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
5 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-aux/m4/buildsys.m4
View file

@ -144,6 +144,7 @@ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
AC_DEFUN([BUILDSYS_SHARED_LIB], [ AC_DEFUN([BUILDSYS_SHARED_LIB], [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
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)
@ -283,7 +284,6 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME) AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
$1 $1
;; ;;
esac esac
]) ])

2
buildsys.mk.in
View file

@ -277,7 +277,7 @@ ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
fi fi
${LINK_STATUS} ${LINK_STATUS}
out="$@"; \ out="$@"; \
if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \ if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
rm -fr $$out; \ rm -fr $$out; \

3
configure.ac
View file

@ -21,7 +21,8 @@ CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)" OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)" LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)"
LIBS="$LIBS $($OBJFW_CONFIG --libs)" AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)")
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)")
AX_CHECK_COMPILER_FLAGS(-Wdocumentation, AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"]) [OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])

3
extra.mk.in
View file

@ -1,3 +1,6 @@
OBJOPENSSL_SHARED_LIB = @OBJOPENSSL_SHARED_LIB@ OBJOPENSSL_SHARED_LIB = @OBJOPENSSL_SHARED_LIB@
OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@ OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@
OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@ OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@
OBJFW_LIBS = @OBJFW_LIBS@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@

2
src/Makefile
View file

@ -17,3 +17,5 @@ INCLUDES = ${SRCS:.m=.h} \
include ../buildsys.mk include ../buildsys.mk
LD = ${OBJC} LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}