summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Schleifer <js@heap.zone>2018-04-22 20:52:28 +0200
committerJonathan Schleifer <js@heap.zone>2018-04-22 20:52:28 +0200
commit819bc471170dfbc55597be886760a0959eb2e06e (patch)
treea35db34ea5261843f04ae375c576d896bb22a482
parentea621bf789e283c29622fc3da830165eba4646c7 (diff)
Relink everything if libobjfw_rt.a changed
-rw-r--r--configure.ac6
-rw-r--r--extra.mk.in2
-rw-r--r--tests/Makefile2
-rw-r--r--utils/ofhash/Makefile2
-rw-r--r--utils/ofhttp/Makefile2
-rw-r--r--utils/ofzip/Makefile2
6 files changed, 12 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index d98a37c9..cdaf3aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,12 @@ case "$objc_runtime" in
-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")
])
diff --git a/extra.mk.in b/extra.mk.in
index 4f361839..0a9f3da3 100644
--- a/extra.mk.in
+++ b/extra.mk.in
@@ -43,6 +43,8 @@ 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@
diff --git a/tests/Makefile b/tests/Makefile
index b42a84eb..25837cfa 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -169,7 +169,7 @@ EBOOT.PBP: ${PROG_NOINST}
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 $< $@
diff --git a/utils/ofhash/Makefile b/utils/ofhash/Makefile
index ad5084b6..3187ab48 100644
--- a/utils/ofhash/Makefile
+++ b/utils/ofhash/Makefile
@@ -9,7 +9,7 @@ include ../../buildsys.mk
PACKAGE_NAME = ofhash
-${PROG}: ${LIBOBJFW_DEP_LVL2}
+${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2}
CPPFLAGS += -I../../src \
-I../../src/runtime \
diff --git a/utils/ofhttp/Makefile b/utils/ofhttp/Makefile
index fe587fd2..f29f374e 100644
--- a/utils/ofhttp/Makefile
+++ b/utils/ofhttp/Makefile
@@ -10,7 +10,7 @@ include ../../buildsys.mk
PACKAGE_NAME = ofhttp
-${PROG}: ${LIBOBJFW_DEP_LVL2}
+${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2}
CPPFLAGS += -I../../src \
-I../../src/runtime \
diff --git a/utils/ofzip/Makefile b/utils/ofzip/Makefile
index 2c4b0baa..0d71d389 100644
--- a/utils/ofzip/Makefile
+++ b/utils/ofzip/Makefile
@@ -12,7 +12,7 @@ include ../../buildsys.mk
PACKAGE_NAME = ofzip
-${PROG}: ${LIBOBJFW_DEP_LVL2}
+${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFW_RT_DEP_LVL2}
CPPFLAGS += -I../../src \
-I../../src/runtime \