ObjFW/ObjPgSQL
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Add support for building as a .framework

Browse source 
FossilOrigin-Name: e3441508b5a2108206d0c5130ca71fc79c12361b32ae1e8cb994c5ee63826a92
This commit is contained in:
Jonathan Schleifer 2018-02-25 23:50:12 +00:00
parent e5b9634a02
commit 2a0c3bb8a1
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -14,5 +14,6 @@ config.log
config.status config.status
configure configure
extra.mk extra.mk
src/ObjPgSQL.framework
tests/tests tests/tests
tests/tests.exe tests/tests.exe

7
configure.ac
View file

@ -22,7 +22,8 @@ CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG --objcflags)" OBJCFLAGS="$OBJCFLAGS $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags)" LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags)"
LIBS="$LIBS $($OBJFW_CONFIG --libs)" AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)")
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)")
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
AC_PROG_RANLIB AC_PROG_RANLIB
@ -33,6 +34,10 @@ AS_IF([test x"$enable_shared" != x"no"], [
AC_SUBST(OBJPGSQL_SHARED_LIB, "${LIB_PREFIX}objpgsql${LIB_SUFFIX}") AC_SUBST(OBJPGSQL_SHARED_LIB, "${LIB_PREFIX}objpgsql${LIB_SUFFIX}")
AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a") AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a") AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a")
BUILDSYS_FRAMEWORK([
AC_SUBST(OBJPGSQL_FRAMEWORK, "ObjPgSQL.framework")
])
]) ])
AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library])) AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [ AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [

3
extra.mk.in
View file

@ -2,5 +2,8 @@ EXCEPTIONS_A = @EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@ EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@
EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@ EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@
OBJPGSQL_FRAMEWORK = @OBJPGSQL_FRAMEWORK@
OBJPGSQL_SHARED_LIB = @OBJPGSQL_SHARED_LIB@ OBJPGSQL_SHARED_LIB = @OBJPGSQL_SHARED_LIB@
OBJPGSQL_STATIC_LIB = @OBJPGSQL_STATIC_LIB@ OBJPGSQL_STATIC_LIB = @OBJPGSQL_STATIC_LIB@

3
src/Makefile
View file

@ -4,6 +4,7 @@ SUBDIRS = exceptions
SHARED_LIB = ${OBJPGSQL_SHARED_LIB} SHARED_LIB = ${OBJPGSQL_SHARED_LIB}
STATIC_LIB = ${OBJPGSQL_STATIC_LIB} STATIC_LIB = ${OBJPGSQL_STATIC_LIB}
FRAMEWORK = ${OBJPGSQL_FRAMEWORK}
LIB_MAJOR = 0 LIB_MAJOR = 0
LIB_MINOR = 1 LIB_MINOR = 1
@ -20,3 +21,5 @@ include ../buildsys.mk
CPPFLAGS += -I. -Iexceptions CPPFLAGS += -I. -Iexceptions
LD = ${OBJC} LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}