Fold HEAD_OBJ and OBJS into BAKEOBJS.

Just give them in the right order, the first one is the first one.

app-tools/Makefile.app-tools

@@ -1,5 +1,5 @@
 _APPTOOLS_PARAMS=  APP_TOOLS_GNUPLATFORM APP_TOOLS_PLATFORM APP_TOOLS_DIR
-_APPTOOLS_PARAMS+= APP_TOOLS_HEADOBJ APP_TOOLS_LDSCRIPT
+_APPTOOLS_PARAMS+= APP_TOOLS_BAKEOBJS APP_TOOLS_LDSCRIPT
 
 define varchk_tmpl
 ifeq ($${$1},)
@@ -45,11 +45,10 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}:			\
 		-e 's#!CPPFLAGS!#$(BUILDRUMP_TOOL_CPPFLAGS)#g;'		\
 		-e 's#!CFLAGS!#$(BUILDRUMP_TOOL_CFLAGS)#g;'		\
 		-e 's#!CXXFLAGS!#$(BUILDRUMP_TOOL_CXXFLAGS)#g;'		\
-		-e 's#!OBJS!#$(APP_TOOLS_OBJS)#g;'			\
+		-e 's#!BAKEOBJS!#$(APP_TOOLS_BAKEOBJS)#g;'		\
 		-e 's#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;'			\
 		-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;'		\
 		-e 's#!LDFLAGS!#$(APP_TOOLS_LDFLAGS)#g;'		\
-		-e 's#!HEAD_OBJ!#$(APP_TOOLS_HEADOBJ)#g;'		\
 		-e 's#!LDSCRIPT!#$(APP_TOOLS_LDSCRIPT)#g;'
 	if test -x $$<; then chmod +x $$@.tmp; fi
 	mv -f $$@.tmp $$@

app-tools/specs-bake.in

@@ -1,5 +1,5 @@
 *startfile:
-!HEAD_OBJ! !OBJS!
+!BAKEOBJS!
 
 *endfile:
 

platform/hw/Makefile

@@ -52,8 +52,7 @@ OBJS= ${OBJS_BMK} ${OBJS_APP}
 .PHONY:	clean cleandir test
 
 APP_TOOLS_PLATFORM= bmk
-APP_TOOLS_HEADOBJ= $(abspath rumprun.o)
-APP_TOOLS_OBJS=
+APP_TOOLS_BAKEOBJS=	$(abspath rumprun.o)
 APP_TOOLS_LDSCRIPT:= $(abspath ${LDSCRIPT})
 APP_TOOLS_DIR:= $(abspath ../../app-tools)
 

platform/xen/Makefile

@@ -68,8 +68,8 @@ $(OBJ_DIR)/rumprun.o: $(RUMP_OBJS) commonlibs
 	$(CC) -Wl,-r $(CFLAGS) $(LDFLAGS) $(RUMP_OBJS) -nostdlib -o $@
 
 APP_TOOLS_PLATFORM= xen
-APP_TOOLS_HEADOBJ= $(abspath $(OBJ_DIR)/xen/minios.o)
-APP_TOOLS_OBJS= $(abspath $(OBJ_DIR)/rumprun.o)
+APP_TOOLS_BAKEOBJS=	$(abspath $(OBJ_DIR)/xen/minios.o)
+APP_TOOLS_BAKEOBJS+=	$(abspath $(OBJ_DIR)/rumprun.o)
 APP_TOOLS_LDSCRIPT:= $(abspath $(OBJ_DIR)/xen/minios.lds)
 APP_TOOLS_DIR= $(abspath ../../app-tools)