From fab94d8da9bb2a1a4660e3f916f1194672f9e677 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Wed, 29 Apr 2015 10:04:31 +0000 Subject: [PATCH] Force the common libs to always be built. And by "always be built" I mean force the top-level build process to consult the respective Makefiles to determine if the libs should be rebuilt or not. --- platform/baremetal/Makefile | 11 ++++++++--- platform/xen/Makefile | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/platform/baremetal/Makefile b/platform/baremetal/Makefile index 9cde8c9..99fd53d 100644 --- a/platform/baremetal/Makefile +++ b/platform/baremetal/Makefile @@ -34,7 +34,7 @@ ifeq (${CONFIG_SYSPROXY},yes) LIBS_SYSPROXY= -lrumpkern_sysproxy endif -all: app-tools include/bmk/machine rumprun.o tests +all: app-tools include/bmk/machine rumprun.o commonlibs tests OBJS_BMK-y+= intr.o clock.o kernel.o undefs.o OBJS_BMK-y+= rumpuser.o rumpconfig.o @@ -99,25 +99,30 @@ include $(APP_TOOLS_DIR)/Makefile.app-tools include/bmk/machine: ln -s ../arch/${MACHINE} include/bmk/machine +.PHONY: ${BASEDIR}/baremetal/librumprun_base.a ${BASEDIR}/baremetal/librumprun_base.a: ( cd ${BASEDIR} \ && ${RUMPMAKE} MAKEOBJDIR=baremetal obj \ && ${RUMPMAKE} MAKEOBJDIR=baremetal dependall ) +.PHONY: ${COREDIR}/baremetal/libbmk_core.a ${COREDIR}/baremetal/libbmk_core.a: ( cd ${COREDIR} \ && ${RUMPMAKE} MAKEOBJDIR=baremetal obj \ && ${RUMPMAKE} MAKEOBJDIR=baremetal dependall ) +.PHONY: ${RUMPUSERDIR}/baremetal/libbmk_rumpuser.a ${RUMPUSERDIR}/baremetal/libbmk_rumpuser.a: ( cd ${RUMPUSERDIR} \ && ${RUMPMAKE} MAKEOBJDIR=baremetal obj \ && ${RUMPMAKE} MAKEOBJDIR=baremetal dependall ) -rumprun.o: ${OBJS} ${BASEDIR}/baremetal/librumprun_base.a ${COREDIR}/baremetal/libbmk_core.a ${RUMPUSERDIR}/baremetal/libbmk_rumpuser.a +rumprun.o: ${OBJS} ${CC} -nostdlib ${CFLAGS} -Wl,-r ${OBJS_BMK} -o $@ -tests: rumprun.o app-tools +commonlibs: ${BASEDIR}/baremetal/librumprun_base.a ${COREDIR}/baremetal/libbmk_core.a ${RUMPUSERDIR}/baremetal/libbmk_rumpuser.a + +tests: rumprun.o commonlibs app-tools $(APP_TOOLS_MAKE) -C ../../tests clean: app-tools_clean diff --git a/platform/xen/Makefile b/platform/xen/Makefile index fcea04f..eafd7d0 100644 --- a/platform/xen/Makefile +++ b/platform/xen/Makefile @@ -77,16 +77,19 @@ prepare: mini-os: $(MAKE) -C xen OBJ_DIR=$(OBJ_DIR)/xen +.PHONY: ${BASEDIR}/xen/librumprun_base.a ${BASEDIR}/xen/librumprun_base.a: ( cd ${BASEDIR} \ && ${RUMPMAKE} MAKEOBJDIR=xen obj \ && ${RUMPMAKE} MAKEOBJDIR=xen dependall ) +.PHONY: ${COREDIR}/xen/libbmk_core.a ${COREDIR}/xen/libbmk_core.a: ( cd ${COREDIR} \ && ${RUMPMAKE} MAKEOBJDIR=xen obj \ && ${RUMPMAKE} MAKEOBJDIR=xen dependall ) +.PHONY: ${RUMPUSERDIR}/xen/libbmk_rumpuser.a ${RUMPUSERDIR}/xen/libbmk_rumpuser.a: ( cd ${RUMPUSERDIR} \ && ${RUMPMAKE} MAKEOBJDIR=xen obj \ -- 2.39.5