Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -460,10 +460,16 @@ "${LIB_PREFIX}objfw_rt${LIB_SUFFIX}") ]) AS_IF([test x"$enable_static" = x"yes" \ -o x"$enable_shared" = x"no"], [ AC_SUBST(OBJFW_RT_STATIC_LIB, "libobjfw_rt.a") + ]) + AS_IF([test x"$enable_shared" = x"no"], [ + AC_SUBST(LIBOBJFW_RT_DEP, + "../src/runtime/libobjfw_rt.a") + AC_SUBST(LIBOBJFW_RT_DEP_LVL2, + "../../src/runtime/libobjfw_rt.a") ]) AS_IF([test x"$build_framework" = x"yes"], [ AC_SUBST(OBJFW_RT_FRAMEWORK, "ObjFW_RT.framework") ]) AC_SUBST(RUNTIME_LIBS, "-lobjfw_rt") Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -41,10 +41,12 @@ INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@ INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@ INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ +LIBOBJFW_RT_DEP = @LIBOBJFW_RT_DEP@ +LIBOBJFW_RT_DEP_LVL2 = @LIBOBJFW_RT_DEP_LVL2@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@ LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -167,11 +167,11 @@ pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL boot.dol: ${PROG_NOINST} elf2dol ${PROG_NOINST} $@ -${PROG_NOINST}: ${LIBOBJFW_DEP} +${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFW_RT_DEP} ${PROG_NOINST}.arm9: ${PROG_NOINST} arm-none-eabi-objcopy -O binary $< $@ ${PROG_NOINST}.nds: ${PROG_NOINST}.arm9 Index: utils/ofhash/Makefile ================================================================== --- utils/ofhash/Makefile +++ utils/ofhash/Makefile @@ -7,15 +7,15 @@ include ../../buildsys.mk PACKAGE_NAME = ofhash -${PROG}: ${LIBOBJFW_DEP_LVL2} +${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2} CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLANGUAGE_DIR=\"${datadir}/ofhash/lang\" LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofhttp/Makefile ================================================================== --- utils/ofhttp/Makefile +++ utils/ofhttp/Makefile @@ -8,15 +8,15 @@ include ../../buildsys.mk PACKAGE_NAME = ofhttp -${PROG}: ${LIBOBJFW_DEP_LVL2} +${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2} CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLANGUAGE_DIR=\"${datadir}/ofhttp/lang\" LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH} Index: utils/ofzip/Makefile ================================================================== --- utils/ofzip/Makefile +++ utils/ofzip/Makefile @@ -10,15 +10,15 @@ include ../../buildsys.mk PACKAGE_NAME = ofzip -${PROG}: ${LIBOBJFW_DEP_LVL2} +${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2} CPPFLAGS += -I../../src \ -I../../src/runtime \ -I../../src/exceptions \ -I../.. \ -DLANGUAGE_DIR=\"${datadir}/ofzip/lang\" LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS} LD = ${OBJC} LDFLAGS += ${LDFLAGS_RPATH}