consistency rename: BAKEOBJS -> OBJS_BAKE

rumpkernel · Jun 29, 2015 · 5d926da · 5d926da
1 parent 33f14d3
commit 5d926da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
@@ -1,5 +1,5 @@
 _APPTOOLS_PARAMS=  APP_TOOLS_GNUPLATFORM APP_TOOLS_PLATFORM APP_TOOLS_DIR
-_APPTOOLS_PARAMS+= APP_TOOLS_BAKEOBJS APP_TOOLS_LDSCRIPT_BAKE
+_APPTOOLS_PARAMS+= APP_TOOLS_OBJS_BAKE APP_TOOLS_LDSCRIPT_BAKE
 _APPTOOLS_PARAMS+= LDFLAGS_BAKE
 
 define varchk_tmpl
@@ -45,7 +45,7 @@ $(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#!BAKEOBJS!#$(APP_TOOLS_BAKEOBJS)#g;'		\
+		-e 's#!OBJS_BAKE!#$(APP_TOOLS_OBJS_BAKE)#g;'		\
 		-e 's#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;'			\
 		-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;'		\
 		-e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;'		\

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
@@ -1,5 +1,5 @@
 *startfile:
-!BAKEOBJS!
+!OBJS_BAKE!
 
 *endfile:
 

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
@@ -52,7 +52,7 @@ OBJS= ${OBJS_BMK} ${OBJS_APP}
 .PHONY:	clean cleandir test
 
 APP_TOOLS_PLATFORM= bmk
-APP_TOOLS_BAKEOBJS=	$(abspath rumprun.o)
+APP_TOOLS_OBJS_BAKE=	$(abspath rumprun.o)
 APP_TOOLS_LDSCRIPT_BAKE:= $(abspath ${LDSCRIPT})
 APP_TOOLS_DIR:= $(abspath ../../app-tools)
 

diff --git a/platform/xen/Makefile b/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_BAKEOBJS=	$(abspath $(OBJ_DIR)/xen/minios.o)
-APP_TOOLS_BAKEOBJS+=	$(abspath $(OBJ_DIR)/rumprun.o)
+APP_TOOLS_OBJS_BAKE=	$(abspath $(OBJ_DIR)/xen/minios.o)
+APP_TOOLS_OBJS_BAKE+=	$(abspath $(OBJ_DIR)/rumprun.o)
 APP_TOOLS_LDSCRIPT_BAKE:= $(abspath $(OBJ_DIR)/xen/minios.lds)
 APP_TOOLS_DIR= $(abspath ../../app-tools)