Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -400,18 +400,16 @@ AS_IF([test x"$enable_shared" != x"no"], [ BUILDSYS_SHARED_LIB BUILDSYS_PLUGIN AC_SUBST(OBJFW_SHARED_LIB, '${LIB_PREFIX}objfw${LIB_SUFFIX}') - AC_SUBST(OBJFWTEST_SHARED_LIB, '${LIB_PREFIX}objfwtest${LIB_SUFFIX}') AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a") AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a") AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a") BUILDSYS_FRAMEWORK([ AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework") - AC_SUBST(OBJFWTEST_FRAMEWORK, "ObjFWTest.framework") build_framework="yes" ]) ], [ AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built]) AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a") @@ -431,11 +429,10 @@ AS_IF([test x"$enable_shared" = x"no"], [ enable_static="yes" ]) AS_IF([test x"$enable_static" = x"yes"], [ AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a") - AC_SUBST(OBJFWTEST_STATIC_LIB, "libobjfwtest.a") AC_SUBST(EXCEPTIONS_A, "exceptions.a") AC_SUBST(FORWARDING_A, "forwarding.a") AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a") ]) Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -26,17 +26,10 @@ OBJFWTLS_FRAMEWORK = @OBJFWTLS_FRAMEWORK@ OBJFWTLS_LIB_MAJOR = 1 OBJFWTLS_LIB_MINOR = 0 OBJFWTLS_LIB_PATCH = 2 -OBJFWTEST_SHARED_LIB = @OBJFWTEST_SHARED_LIB@ -OBJFWTEST_STATIC_LIB = @OBJFWTEST_STATIC_LIB@ -OBJFWTEST_FRAMEWORK = @OBJFWTEST_FRAMEWORK@ -OBJFWTEST_LIB_MAJOR = 1 -OBJFWTEST_LIB_MINOR = 0 -OBJFWTEST_LIB_PATCH = 0 - BIN_PREFIX = @BIN_PREFIX@ BRIDGE = @BRIDGE@ CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@ ENCODINGS_A = @ENCODINGS_A@ ENCODINGS_LIB_A = @ENCODINGS_LIB_A@ Index: src/test/Makefile ================================================================== --- src/test/Makefile +++ src/test/Makefile @@ -1,15 +1,10 @@ include ../../extra.mk DISTCLEAN = Info.plist -SHARED_LIB = ${OBJFWTEST_SHARED_LIB} -STATIC_LIB = ${OBJFWTEST_STATIC_LIB} -FRAMEWORK = ${OBJFWTEST_FRAMEWORK} -LIB_MAJOR = ${OBJFWTEST_LIB_MAJOR} -LIB_MINOR = ${OBJFWTEST_LIB_MINOR} -LIB_PATCH = ${OBJFWTEST_LIB_PATCH} +STATIC_LIB = libobjfwtest.a SRCS = OTAssert.m \ OTTestCase.m INCLUDES := ${SRCS:.m=.h} \ ObjFWTest.h