aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-04-05 02:56:28 +0200
committerClifford Wolf <clifford@clifford.at>2014-04-05 02:56:28 +0200
commit6ef2224331e7246d1e107c9e533a7cadce786107 (patch)
tree52555d22f10783c6f8eeaab3dbee76579d1f3014
parent7370ae01e978f0552f1565b88c0f44b402d09f4e (diff)
parent66a5da5edc41a2b33413c965337001bb179d30f6 (diff)
downloadyosys-6ef2224331e7246d1e107c9e533a7cadce786107.tar.gz
yosys-6ef2224331e7246d1e107c9e533a7cadce786107.tar.bz2
yosys-6ef2224331e7246d1e107c9e533a7cadce786107.zip
Merge pull request #31 from bentley/posix-rm
Remove non-POSIX 'rm -v'.
-rw-r--r--Makefile8
-rw-r--r--libs/minisat/UPDATE.sh2
-rwxr-xr-xmanual/clean.sh2
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 45bdc47ac..69fbf5222 100644
--- a/Makefile
+++ b/Makefile
@@ -176,11 +176,11 @@ manual: $(TARGETS) $(EXTRA_TARGETS)
cd manual && bash manual.sh
clean:
- rm -rvf share
+ rm -rf share
cd manual && bash clean.sh
- rm -vf $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS)
- rm -vf kernel/version_*.o kernel/version_*.cc abc/abc-[0-9a-f]*
- rm -vf libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
+ rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS)
+ rm -f kernel/version_*.o kernel/version_*.cc abc/abc-[0-9a-f]*
+ rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
test ! -f libs/svgviewer/Makefile || make -C libs/svgviewer distclean
mrproper: clean
diff --git a/libs/minisat/UPDATE.sh b/libs/minisat/UPDATE.sh
index 539ee23f8..a84290279 100644
--- a/libs/minisat/UPDATE.sh
+++ b/libs/minisat/UPDATE.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-rm -fv LICENSE *.cc *.h
+rm -f LICENSE *.cc *.h
git clone --depth 1 https://github.com/niklasso/minisat minisat_upstream
rm minisat_upstream/minisat/*/Main.cc
mv minisat_upstream/LICENSE minisat_upstream/minisat/*/*.{h,cc} .
diff --git a/manual/clean.sh b/manual/clean.sh
index 13554c01b..f4a2ea83a 100755
--- a/manual/clean.sh
+++ b/manual/clean.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-for f in $( find -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -vf,;" $f; done | bash -v
+for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -f,;" $f; done | bash -v