From ffed7227c3313fa8d1ac2b6e36d4867348437508 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 3 Jul 2013 12:59:59 +0200 Subject: [PATCH] Revert "doc: add script to compute texi files dependencies" This reverts commit 628ceac6526724d35cb390cc1f88344f4ea22eb4. The commit broke out of tree builds --- configure | 4 ++-- doc/Makefile | 2 +- doc/texidep.pl | 22 ---------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 doc/texidep.pl diff --git a/configure b/configure index 97f6913f2f..dd6e9510b0 100755 --- a/configure +++ b/configure @@ -2214,8 +2214,8 @@ ffserver_extralibs='$ldl' # documentation podpages_deps="perl" manpages_deps="perl pod2man" -htmlpages_deps="perl texi2html" -txtpages_deps="perl makeinfo" +htmlpages_deps="texi2html" +txtpages_deps="makeinfo" doc_deps_any="manpages htmlpages podpages txtpages" # default parameters diff --git a/doc/Makefile b/doc/Makefile index ab18146f41..cd24b8c597 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -43,7 +43,7 @@ doc: documentation apidoc: doc/doxy/html documentation: $(DOCS) -TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $< $@ >$(@:%=%.d) +TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) doc/%.txt: TAG = TXT doc/%.txt: doc/%.texi diff --git a/doc/texidep.pl b/doc/texidep.pl deleted file mode 100644 index 0275e74709..0000000000 --- a/doc/texidep.pl +++ /dev/null @@ -1,22 +0,0 @@ -#! /usr/bin/perl - -use warnings; -use strict; - -my ($root, $target) = @ARGV; - -sub print_deps { - my ($file, $deps) = @_; - $deps->{$file} = 1; - - open(my $fh, "$file") or die "Cannot open file '$file': $!"; - while (<$fh>) { - /^@(?:verbatim)?include\s+(\S+)/ and do { - die "Circular dependency found in file $root\n" if exists $deps->{"doc/$1"}; - print "$target: doc/$1\n"; - print_deps("doc/$1", {%$deps}); - } - } -} - -print_deps($root, {});