Update buildsys

FossilOrigin-Name: a607fd2cde697182961820ada71e557cd5d8f9be70ceafc5d82fd5ef899158a6

ObjSQLite3.oc.in

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

build-aux/m4/buildsys.m4

@@ -309,6 +309,7 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
 
 			AC_SUBST(FRAMEWORK_LDFLAGS)
 			AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
+			AC_SUBST(FRAMEWORK_LIBS)
 
 			$1
 			;;

buildsys.mk.in

@@ -63,6 +63,7 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
 PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
 FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@
 FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@
+FRAMEWORK_LIBS = @FRAMEWORK_LIBS@
 CODESIGN = @CODESIGN@
 CODESIGN_IDENTITY ?= -
 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}
 	${LINK_STATUS}
 	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}; \
 	else \
 		rm -fr $$out; false; \

configure.ac

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

extra.mk.in

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

src/Makefile

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

tests/Makefile

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