[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

[legatvs]

The following commit has been merged in the master branch:
commit a79dabbfeeafb9e9bdf0df6fe7b963ae869e8377
Author: legatvs <legatvs at gmail.com>
Date:   Mon Jan 26 12:31:34 2009 +0200

    Changed Makefile 'all' target default to 'checks'.

diff --git a/INSTALL b/INSTALL
index 3194a74..63cd6ce 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,9 @@
 
     clive installation
 
-Normally you can do "make install. This will install the clive in your own
-~/bin/ directory. If you want to do a global install, you can do (as root):
+Normally you can do "make" and then "make install. That will first check for
+the required Perl modules and then install the clive in your own ~/bin/
+directory. If you want to do a global install, you can do (as root):
 
  # make prefix=/usr install
 
@@ -14,11 +15,6 @@ When you uninstall, be sure to use the same prefix. For example:
 
  # make prefix=/usr uninstall
 
-clive requires several Perl modules to be installed. There is a rudimentary
-way to check whether these are available in your system:
-
- # make checkmods
-
 Developers may also find the following make target useful:
 
  man # generate clive.1 from clive (req. pod2man)
diff --git a/Makefile b/Makefile
index 698d801..0c71ce0 100644
--- a/Makefile
+++ b/Makefile
@@ -20,55 +20,35 @@ ifndef V
 QUIET_POD2MAN   = @echo '  ' POD2MAN clive.1;
 endif
 
-.PHONY: all
-all:
-
-m_URIEscape := \
-    $(shell sh -c "$(PERL) -MURI::Escape -e 1 2>/dev/null || \
-        echo 'no'")
-m_XMLSimple := \
-    $(shell sh -c "$(PERL) -MXML::Simple -e 1 2>/dev/null || \
-        echo 'no'")
-m_WWWCurl := \
-    $(shell sh -c "$(PERL) -e 'use WWW::Curl 4.05' 2>/dev/null || \
-        echo 'no'")
-m_HTMLTokeParser:= \
-    $(shell sh -c "$(PERL) -MHTML::TokeParser -e 1 2>/dev/null || \
-        echo 'no'")
-m_ConfigTiny := \
-    $(shell sh -c "$(PERL) -MConfig::Tiny -e 1 2>/dev/null || \
-        echo 'no'")
-m_BerkeleyDB := \
-    $(shell sh -c "$(PERL) -MBerkeleyDB -e 1 2>/dev/null || \
-        echo 'no'")
-
 RELEASE := \
     $(shell sh -c "$(AWK) '/constant VERSION/ {print \$$5}' clive | \
         $(TR) -d '[\";]'")
 
-.PHONY: checkmods install uninstall
-checkmods:
-	@echo checking...
-ifeq ($(m_URIEscape),no)
-	@echo URI::Escape module not found
-endif
-ifeq ($(m_XMLSimple),no)
-	@echo XML::Simple module not found
-endif
-ifeq ($(m_WWWCurl),no)
-	@echo WWW::Curl (4.05+) module not found
-endif
-ifeq ($(m_HTMLTokeParser),no)
-	@echo HTML::TokeParser module not found
-endif
-ifeq ($(m_ConfigTiny),no)
-	@echo Config::Tiny module not found
-endif
-ifeq ($(m_BerkeleyDB),no)
-	@echo BerkeleyDB module not found
-endif
+.PHONY: all checks
+all: checks
+
+checks:
+	@echo -n URI::Escape ...
+	@echo `$(PERL) -MURI::Escape -e "print 'OK'" 2>/dev/null || \
+        echo 'no'`
+	@echo -n XML::Simple ...
+	@echo `$(PERL) -MXML::Simple -e "print 'OK'" 2>/dev/null || \
+        echo 'no'`
+	@echo -n WWW::Curl 4.05+ ...
+	@echo `$(PERL) -e "use WWW::Curl 4.05; print 'OK'" 2>/dev/null || \
+        echo 'no'`
+	@echo -n HTML::TokeParser ...
+	@echo `$(PERL) -MHTML::TokeParser -e "print 'OK'" 2>/dev/null || \
+        echo 'no'`
+	@echo -n Config::Tiny ...
+	@echo `$(PERL) -MConfig::Tiny -e "print 'OK'" 2>/dev/null || \
+        echo 'no'`
+	@echo -n BerkeleyDB ...
+	@echo `$(PERL) -MBerkeleyDB -e "print 'OK'" 2>/dev/null || \
+        echo 'no'`
 	@echo done.
 
+.PHONY: install uninstall
 install:
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) -C clive $(DESTDIR)$(bindir)/clive

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)