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

Update buildsys

Browse source 
FossilOrigin-Name: a607fd2cde697182961820ada71e557cd5d8f9be70ceafc5d82fd5ef899158a6
This commit is contained in:
Jonathan Schleifer 2020-10-03 00:03:19 +00:00
parent e480f8892d
commit 5b8af3d987
7 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ObjSQLite3.oc.in
View file

@ -1,3 +1,4 @@
package_format 1 package_format 1
CPPFLAGS="$CPPFLAGS @SQLITE3_CPPFLAGS@" CPPFLAGS="$CPPFLAGS @SQLITE3_CPPFLAGS@"
LIBS="-lobjsqlite3 @SQLITE3_LIBS@ $LIBS" LIBS="-lobjsqlite3 @SQLITE3_LIBS@ $LIBS"
FRAMEWORK_LIBS="-framework ObjSQLite3 @SQLITE3_LIBS@ $FRAMEWORK_LIBS"

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

@ -309,6 +309,7 @@ AC_DEFUN([BUILDSYS_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)
$1 $1
;; ;;

3
buildsys.mk.in
View file

@ -63,6 +63,7 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@ FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@
FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@ FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@
FRAMEWORK_LIBS = @FRAMEWORK_LIBS@
CODESIGN = @CODESIGN@ CODESIGN = @CODESIGN@
CODESIGN_IDENTITY ?= - CODESIGN_IDENTITY ?= -
CLEAN_LIB = @CLEAN_LIB@ CLEAN_LIB = @CLEAN_LIB@
@ -191,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
out="$@"; \ out="$@"; \
if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${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 \ if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
rm -fr $$out; false; \ rm -fr $$out; false; \

4
configure.ac
View file

@ -28,8 +28,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)"
AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)") FRAMEWORK_LIBS="$($OBJFW_CONFIG --framework-libs) $LIBS"
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)") LIBS="$($OBJFW_CONFIG --libs) $LIBS"
AX_CHECK_COMPILER_FLAGS(-Wdocumentation, AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"]) [OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])

2
extra.mk.in
View file

@ -10,6 +10,4 @@ EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
LIBOBJSQLITE3_DEP = @LIBOBJSQLITE3_DEP@ LIBOBJSQLITE3_DEP = @LIBOBJSQLITE3_DEP@
OBJFW_CONFIG = @OBJFW_CONFIG@ OBJFW_CONFIG = @OBJFW_CONFIG@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@
RUN_TESTS = @RUN_TESTS@ RUN_TESTS = @RUN_TESTS@

6
src/Makefile
View file

@ -5,8 +5,8 @@ SUBDIRS = exceptions
SHARED_LIB = ${OBJSQLITE3_SHARED_LIB} SHARED_LIB = ${OBJSQLITE3_SHARED_LIB}
STATIC_LIB = ${OBJSQLITE3_STATIC_LIB} STATIC_LIB = ${OBJSQLITE3_STATIC_LIB}
FRAMEWORK = ${OBJSQLITE3_FRAMEWORK} FRAMEWORK = ${OBJSQLITE3_FRAMEWORK}
LIB_MAJOR = 0 LIB_MAJOR = ${OBJSQLITE3_LIB_MAJOR}
LIB_MINOR = 0 LIB_MINOR = ${OBJSQLITE3_LIB_MINOR}
SRCS = SL3Connection.m \ SRCS = SL3Connection.m \
SL3PreparedStatement.m SL3PreparedStatement.m
@ -20,5 +20,3 @@ include ../buildsys.mk
CPPFLAGS += -I. -Iexceptions -DSL3_PUBLIC_IVARS CPPFLAGS += -I. -Iexceptions -DSL3_PUBLIC_IVARS
LD = ${OBJC} LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}

2
tests/Makefile
View file

@ -41,5 +41,5 @@ run:
${PROG_NOINST}: ${LIBOBJSQLITE3_DEP} ${PROG_NOINST}: ${LIBOBJSQLITE3_DEP}
CPPFLAGS += -I../src CPPFLAGS += -I../src
LIBS := -L../src -lobjsqlite3 ${OBJFW_LIBS} ${LIBS} LIBS := -L../src -lobjsqlite3 ${LIBS}
LD = ${OBJC} LD = ${OBJC}