summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-10-28 17:10:51 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-28 17:10:51 +0000
commit6c73b4416ccda3d02bfaf9526ec356960260253b (patch)
tree59e666a757a957d1b89170ed4ee8b4b006d24b12 /util
parent1a08f582b54ec9fff0f356a824647ee40b3a5008 (diff)
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
Diffstat (limited to 'util')
-rw-r--r--util/cbfstool/Makefile.inc16
-rw-r--r--util/sconfig/config.g4
-rw-r--r--util/sconfig/parsedesc.g2
-rw-r--r--util/sconfig/yapps2.py2
4 files changed, 12 insertions, 12 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 18434bdd49..782ce375b3 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -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
diff --git a/util/sconfig/config.g b/util/sconfig/config.g
index d8bc855021..94c665f15e 100644
--- a/util/sconfig/config.g
+++ b/util/sconfig/config.g
@@ -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")
diff --git a/util/sconfig/parsedesc.g b/util/sconfig/parsedesc.g
index 1347c87438..acb8524838 100644
--- a/util/sconfig/parsedesc.g
+++ b/util/sconfig/parsedesc.g
@@ -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
diff --git a/util/sconfig/yapps2.py b/util/sconfig/yapps2.py
index 189db9d81b..b408cbcfb2 100644
--- a/util/sconfig/yapps2.py
+++ b/util/sconfig/yapps2.py
@@ -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