]> xenbits.xensource.com Git - osstest/rumprun.git/commitdiff
g/c APPTOOLS_OBJS_BAKE, it does not contain any extra info.
authorAntti Kantee <pooka@iki.fi>
Thu, 15 Oct 2015 16:55:55 +0000 (16:55 +0000)
committerAntti Kantee <pooka@iki.fi>
Thu, 15 Oct 2015 16:55:55 +0000 (16:55 +0000)
app-tools/Makefile.app-tools
app-tools/specs-bake.in
platform/hw/Makefile
platform/xen/Makefile

index 7ad0ce7187756ef3e5c23a56fa3c89cd58f0a836..792c176ae85dd501527b6fb78bbdb2c99243d4da 100644 (file)
@@ -1,5 +1,4 @@
 _APPTOOLS_PARAMS=  APP_TOOLS_PLATFORM APP_TOOLS_DIR
-_APPTOOLS_PARAMS+= APP_TOOLS_OBJS_BAKE
 _APPTOOLS_PARAMS+= LDFLAGS_BAKE
 
 define varchk_tmpl
@@ -57,7 +56,6 @@ $(APP_TOOLS_DIR)/${2}:                                                        \
                -e 's#!CPPFLAGS!#$(BUILDRUMP_TOOL_CPPFLAGS)#g;'         \
                -e 's#!CFLAGS!#$(BUILDRUMP_TOOL_CFLAGS)#g;'             \
                -e 's#!CXXFLAGS!#$(BUILDRUMP_TOOL_CXXFLAGS)#g;'         \
-               -e 's#!OBJS_BAKE!#$(APP_TOOLS_OBJS_BAKE)#g;'            \
                -e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;'
        if test -x $$<; then chmod +x $$@.tmp; fi
        mv -f $$@.tmp $$@
index 7b3158d45b3d04cb54c4b0d56fa065038058c28c..de8689c69c20d804048709ad4a4817f942433eae 100644 (file)
@@ -1,5 +1,5 @@
 *startfile:
-!DESTDIR!/lib/!OBJS_BAKE!
+!DESTDIR!/lib/rumprun-!APPTOOLS_PLATFORM!-!MACHINE_ARCH!.o
 
 *endfile:
 
index 6111fa45127fdf7f5c2e06f88640829a6496ab88..8776d51e44d34ff039bac6ef739f8433b60a80b0 100644 (file)
@@ -58,7 +58,6 @@ include arch/${ARCHDIR}/Makefile.inc
 .PHONY:        clean cleandir test
 
 APP_TOOLS_PLATFORM= hw
-APP_TOOLS_OBJS_BAKE=   ${MAINOBJ}
 APP_TOOLS_DIR:= $(abspath ../../app-tools)
 
 include ${APP_TOOLS_DIR}/Makefile.app-tools
index 0ee1cd9f57208e30f8f55c8da4d043f8bd044a4f..b998b4965037a068a9786f2933ae3f4468a9b1ba 100644 (file)
@@ -79,7 +79,6 @@ $(MAINOBJ): $(RUMP_OBJS) platformlibs
            -lbmk_rumpuser -lbmk_core -Wl,--no-whole-archive
 
 APP_TOOLS_PLATFORM= xen
-APP_TOOLS_OBJS_BAKE=   $(MAINOBJ)
 APP_TOOLS_DIR= $(abspath ../../app-tools)
 
 include $(APP_TOOLS_DIR)/Makefile.app-tools