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.

diff --git a/platform/baremetal/Makefile b/platform/baremetal/Makefile
index 9cde8c9519cfe95a774812a7035722f70126e8e2..99fd53d29748cbf335c331cf7e3ab33272c3eedb 100644 (file)
--- 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 fcea04f22ea69ad6a2aa0555a54c490cb074d950..eafd7d04082e052b279617bbd988855b56cfe042 100644 (file)
--- 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 \