Merge pull request #228 from tonytheodore/deps

Makefile and docs: add EXCLUDE_PKGS and show*deps* functionality

2 files changed, 7 insertions, 36 deletions

diff --git a/tools/freebsd-excludes b/tools/freebsd-excludes
deleted file mode 100755
index b94e248..0000000
--- a/tools/freebsd-excludes
+++ /dev/null
@@ -1,35 +0,0 @@
-gmake \
-gtksourceviewmm2_BUILD_x86_64-w64-mingw32= \
-graphicsmagick_BUILD= \
-openexr_BUILD= \
-opencv_BUILD= \
-pcl_BUILD= \
-vigra_BUILD= \
-vtk6_BUILD= \
-qwt_BUILD= \
-ocaml-cairo_BUILD= \
-ocaml-findlib_BUILD= \
-ocaml-lablgtk2_BUILD= \
-ocaml-camlimages_BUILD= \
-ocaml-flexdll_BUILD= \
-ocaml-native_BUILD= \
-ocaml-core_BUILD= \
-ocaml-lablgl_BUILD= \
-ocaml-xml-light_BUILD= \
-qtactiveqt_BUILD= \
-qtbase_BUILD= \
-qtdeclarative_BUILD= \
-qtgraphicaleffects_BUILD= \
-qtimageformats_BUILD= \
-qtjsbackend_BUILD= \
-qtmultimedia_BUILD= \
-qtquickcontrols_BUILD= \
-qtquick1_BUILD= \
-qtscript_BUILD= \
-qtsensors_BUILD= \
-qtserialport_BUILD= \
-qtsvg_BUILD= \
-qttools_BUILD= \
-qttranslations_BUILD= \
-qtxmlpatterns_BUILD= \
--j4 -k
diff --git a/tools/mxe-activate b/tools/mxe-activate
index 2ef2398..5a59ddd 100644
--- a/tools/mxe-activate
+++ b/tools/mxe-activate
@@ -40,8 +40,14 @@ _mxe()
         COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) )
         return 0
         ;;
+    show-*deps-*)
+        local base=`echo ${cur} | $SED -n 's,\(show.*deps-\).*,\1,p'`
+        local _pkgs=$( for x in ${pkgs}; do echo $base${x} ; done )
+        COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) )
+        return 0
+        ;;
     [!-]*)
-        pkgs+=" build-only- check-requirements clean clean-pkg download download- update-checksum-"
+        pkgs+=" build-only- check-requirements clean clean-pkg download download- update-checksum- show-deps- show-downstream-deps- show-upstream-deps-"
         COMPREPLY=( $(compgen -W "${pkgs}" -- ${cur}) )
         return 0
         ;;