Remove all build/ prefixes in the build output.
Also, remove one missing hardcoded "build" dir in the distclean target, and clean up files generated by sconfig in 'make clean'. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4880 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -22,35 +22,35 @@ $(obj)/util/cbfstool:
|
||||
mkdir -p $@
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c
|
||||
printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
|
||||
printf " HOSTCXX $(subst $(shell pwd)/,,$(@)) (link)\n"
|
||||
printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n"
|
||||
$(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
|
||||
|
||||
endif
|
||||
|
@@ -886,7 +886,7 @@ def dumptree(part, lvl):
|
||||
|
||||
def writecode(image):
|
||||
filename = os.path.join(img_dir, "static.c")
|
||||
print " SCONFIG ", join(filename.split('/')[-5:], '/')
|
||||
print " SCONFIG ", join(filename.split('/')[-4:], '/')
|
||||
file = safe_open(filename, 'w+')
|
||||
file.write("#include <device/device.h>\n")
|
||||
file.write("#include <device/pci.h>\n")
|
||||
@@ -920,7 +920,7 @@ def gencode(part, file, pass_num):
|
||||
|
||||
def writegraph(image):
|
||||
filename = os.path.join(img_dir, "static.dot")
|
||||
print " SCONFIG ", join(filename.split('/')[-5:], '/')
|
||||
print " SCONFIG ", join(filename.split('/')[-4:], '/')
|
||||
file = safe_open(filename, 'w+')
|
||||
file.write("digraph devicetree {\n")
|
||||
file.write(" rankdir=LR\n")
|
||||
|
@@ -126,7 +126,7 @@ def generate(inputfilename, outputfilename='', dump=0, **flags):
|
||||
if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
|
||||
else: raise "Invalid Filename", outputfilename
|
||||
|
||||
print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/')
|
||||
print ' SCONFIG ', join(outputfilename.split('/')[-4:], '/')
|
||||
|
||||
DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
|
||||
preparser, postparser = None, None # Code before and after the parser desc
|
||||
|
@@ -710,7 +710,7 @@ def generate(inputfilename, outputfilename='', dump=0, **flags):
|
||||
if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py'
|
||||
else: raise "Invalid Filename", outputfilename
|
||||
|
||||
print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/')
|
||||
print ' SCONFIG ', join(outputfilename.split('/')[-4:], '/')
|
||||
|
||||
DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers
|
||||
preparser, postparser = None, None # Code before and after the parser desc
|
||||
|
Reference in New Issue
Block a user