[vlc-commits] contribs: add "make help"
Rémi Denis-Courmont
git at videolan.org
Tue May 17 17:24:47 CEST 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue May 17 18:24:16 2016 +0300| [9edab21020cceb83af19f1c9b128f74703b6b7d0] | committer: Rémi Denis-Courmont
contribs: add "make help"
This shows the same text as bootstrap when it ends.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9edab21020cceb83af19f1c9b128f74703b6b7d0
---
contrib/bootstrap | 19 ++-----------------
contrib/src/help.txt | 13 +++++++++++++
contrib/src/main.mak | 5 ++++-
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 32f5666..d50e6a4 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -341,21 +341,6 @@ esac
#
test -e Makefile && unlink Makefile
ln -sf ../../contrib/src/main.mak Makefile || exit $?
-cat << EOF
-Bootstrap completed.
-
-Run "make" to start compilation.
-
-Other targets:
- * make install same as "make"
- * make prebuilt fetch and install prebuilt binaries
- * make list list packages
- * make fetch fetch required source tarballs
- * make fetch-all fetch all source tarballs
- * make distclean clean everything and undo bootstrap
- * make mostlyclean clean everything except source tarballs
- * make clean clean everything
- * make package prepare prebuilt packages
-EOF
-
+echo "Bootstrap completed."
+make help
mkdir -p ../../contrib/tarballs || exit $?
diff --git a/contrib/src/help.txt b/contrib/src/help.txt
new file mode 100644
index 0000000..d64ca8e
--- /dev/null
+++ b/contrib/src/help.txt
@@ -0,0 +1,13 @@
+Run "make" to start compilation.
+
+Other targets:
+ * make install same as "make"
+ * make prebuilt fetch and install prebuilt binaries
+ * make list list packages
+ * make fetch fetch required source tarballs
+ * make fetch-all fetch all source tarballs
+ * make distclean clean everything and undo bootstrap
+ * make mostlyclean clean everything except source tarballs
+ * make clean clean everything
+ * make package prepare prebuilt packages
+ * make help show this text
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index edb3dbd..7844687 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -442,7 +442,10 @@ list:
@echo To-be-built packages:
@echo ' $(PKGS)' | tr " " "\n" | sort | tr "\n" " " |fmt
-.PHONY: all fetch fetch-all install mostlyclean clean distclean package list prebuilt
+help:
+ @cat $(SRC)/help.txt
+
+.PHONY: all fetch fetch-all install mostlyclean clean distclean package list help prebuilt
# CMake toolchain
toolchain.cmake:
More information about the vlc-commits
mailing list