[PATCH] osmo-gsm-manuals[master]: fix 'make clean': shell glob, ignore failure

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/1096

fix 'make clean': shell glob, ignore failure

Unfortunately a glob like osmo-x__*.{svg,png} doesn't work, so have the
suffixes in separate globs.

Add dashes to indicate that failure should be ignored.

Change-Id: I6bc4d9ea72b43a573acbc860c23397f748de2c7b
---
M OsmoBSC/Makefile
M OsmoBTS/Makefile
M OsmoMGCP/Makefile
M OsmoNAT/Makefile
M OsmoNITB/Makefile
M OsmoPCU/Makefile
M OsmoSGSN/Makefile
7 files changed, 25 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/96/1096/1

diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile
index 9fc6f26..284ac3b 100644
--- a/OsmoBSC/Makefile
+++ b/OsmoBSC/Makefile
@@ -23,8 +23,10 @@
 osmobsc-usermanual.pdf: chapters/*.adoc
 
 clean:
-	rm -rf $(cleanfiles)
-	rm -rf osmobsc-usermanual__*.{svg,png,check}
+	-rm -rf $(cleanfiles)
+	-rm osmobsc-usermanual__*.png
+	-rm osmobsc-usermanual__*.svg
+	-rm osmobsc-usermanual*.check
 
 gen-bsc-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile
index 0587de8..1b4e738 100644
--- a/OsmoBTS/Makefile
+++ b/OsmoBTS/Makefile
@@ -11,6 +11,10 @@
 osmobts-usermanual.pdf: chapters/*.adoc
 
 clean:
-	rm -rf $(cleanfiles)
-	rm -rf osmobts-abis__*.{svg,png,check}
-	rm -rf osmobts-usermanual__*.{svg,png,check}
+	-rm -rf $(cleanfiles)
+	-rm osmobts-abis__*.png
+	-rm osmobts-abis__*.svg
+	-rm osmobts-usermanual__*.png
+	-rm osmobts-usermanual__*.svg
+	-rm osmobts-abis*.check
+	-rm osmobts-usermanual*.check
diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile
index aba8e3d..9aff12b 100644
--- a/OsmoMGCP/Makefile
+++ b/OsmoMGCP/Makefile
@@ -16,7 +16,7 @@
 include ../build/Makefile.inc
 
 clean:
-	rm -rf $(cleanfiles)
+	-rm -rf $(cleanfiles)
 
 gen-mgcp-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile
index 3ace4d2..d7302e6 100644
--- a/OsmoNAT/Makefile
+++ b/OsmoNAT/Makefile
@@ -16,7 +16,7 @@
 include ../build/Makefile.inc
 
 clean:
-	rm -rf $(cleanfiles)
+	-rm -rf $(cleanfiles)
 
 gen-nat-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile
index e68b9b0..99cd317 100644
--- a/OsmoNITB/Makefile
+++ b/OsmoNITB/Makefile
@@ -22,8 +22,10 @@
 osmonitb-usermanual.pdf: chapters/*.adoc
 
 clean:
-	rm -rf $(cleanfiles)
-	rm -rf osmonitb-usermanual__*.{svg,png,check}
+	-rm -rf $(cleanfiles)
+	-rm osmonitb-usermanual__*.svg
+	-rm osmonitb-usermanual__*.png
+	-rm osmonitb-usermanual.check
 
 gen-nitb-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile
index 1f06183..a83b909 100644
--- a/OsmoPCU/Makefile
+++ b/OsmoPCU/Makefile
@@ -23,9 +23,11 @@
 osmopcu-usermanual.pdf: chapters/*.adoc
 
 clean:
-	rm -rf $(cleanfiles)
-	rm -rf gen-vty-docbook
-	rm -rf osmopcu-usermanual__*.{svg,png,check}
+	-rm -rf $(cleanfiles)
+	-rm -rf gen-vty-docbook
+	-rm osmopcu-usermanual__*.png
+	-rm osmopcu-usermanual__*.svg
+	-rm osmopcu-usermanual.check
 
 gen-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile
index 7df5168..6f7d28d 100644
--- a/OsmoSGSN/Makefile
+++ b/OsmoSGSN/Makefile
@@ -22,8 +22,9 @@
 osmosgsn-usermanual.pdf: chapters/*.adoc
 
 clean:
-	rm -rf osmosgsn-usermanual__*.{svg,png,check}
-	rm -rf $(cleanfiles)
+	-rm -rf $(cleanfiles)
+	-rm osmosgsn-usermanual__*.svg osmosgsn-usermanual__*.png
+	-rm osmosgsn-usermanual.check
 
 gen-sgsn-vty-docbook: FORCE
 	$(call command,xsltproc -o generated/combined1.xml \

-- 
To view, visit https://gerrit.osmocom.org/1096
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bc4d9ea72b43a573acbc860c23397f748de2c7b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>