X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=autogen.pl;h=7b7c1de08a030f4a3a49694d31dadfea12ca6c43;hb=7e5565fb2d5e0e92721becbec73b1dc152cc1c32;hp=213f26334ecbde85c692feb2a7286382b79b73ef;hpb=2d70108ff7d6fdb696e89da758d6779d9e72cf06;p=captive.git

diff --git a/autogen.pl b/autogen.pl
index 213f263..7b7c1de 100755
--- a/autogen.pl
+++ b/autogen.pl
@@ -36,35 +36,71 @@ AutoGen->run(
 		"ARGV"=>\@ARGV,
 		"gtk-doc-dir"=>"./doc/apiref/",
 		"clean"=>[qw(
-				.include_test_false.c
+				_include_test_false.c
 				.include_test_all.stamp
+				*.pod.pl *.pod *.[0-9]
 				./ChangeLog.bak
+				./debian/changelog
 				./doc/*-pod.*
-				./doc/apiref/captive.types
+				./doc/pod2htm[di].tmp
+				./doc/apiref/gtk-doc.make
+				./doc/apiref/gtk-doc.make-captive
+				./fonts/fonts.conf
+				./src/client/bug-replay/captive-bug-replay
 				./src/client/cmdline/captive-cmdline
-				./src/client/libcaptive-gnomevfs/captive.conf
+				./src/client/lufs/mount.captive
+				./src/client/fuse/mount.captive
+				./src/client/fuse/captive
+				./src/client/sandbox-server/captive-sandbox-server
+				./src/client/gnomevfs/captive.conf
+				./src/install/fstab/captive-install-fstab
+				./src/install/acquire/captive-install-acquire
+				./src/install/acquire/ui-gnome-callbacks.[ch]
+				./src/install/acquire/ui-gnome-interface.[ch]
+				./src/install/acquire/ui-gnome-support.[ch]
+				./src/install/acquire/ui-gnome.glade.bak
+				./src/install/acquire/ui-gnome.gladep.bak
+				./src/install/acquire/gnome_vfs_read_entire_file.c
+				./src/libcaptive/cc/marshallers.[ch]
+				./src/libcaptive/client/marshallers.[ch]
 				./src/libcaptive/ke/exports.c
-				./src/libcaptive/reactos/*/*.c
+				./src/libcaptive/reactos/*/*.[cS]
 				./src/libcaptive/sandbox/sandbox-common.c
 				./src/libcaptive/sandbox/sandbox-skels.c
 				./src/libcaptive/sandbox/sandbox-stubs.c
 				./src/libcaptive/sandbox/sandbox.h
 				./src/libcaptive/sandbox/sandbox-skelimpl.c
+				./src/TraceFS/TraceFS-W32/obj
+				./src/TraceFS/TraceFS-W32/objchk
+				./src/TraceFS/TraceFS-W32/objfre
+				./src/TraceFS/TraceFS-W32/buildchk.log
+				./src/TraceFS/TraceFS-W32/buildchk.wrn
+				./src/TraceFS/TraceFS-W32/buildchk.err
+				./src/TraceFS/TraceFS-W32/buildfre.log
+				./src/TraceFS/TraceFS-W32/buildfre.wrn
+				./src/TraceFS/TraceFS-W32/buildfre.err
 				)],
 		"prep"=>sub {
-				local $/;
-				undef $/;
-				local *F;
-				do { open F,$_ or confess "Open $_: $!"; } for ("libtoolize -n|");
-				my $libtoolize_out=<F>;
-				close F;
-				my $ltmain_sh_fn=($libtoolize_out=~m#\s(/\S*/\Qltmain.sh\E)\b#)[0];
-				confess "'ltmain.sh' pathname not found in libtoolize(1) output" if !$ltmain_sh_fn;
-				do { open F,$_ or confess "Open $_: $!"; } for ($ltmain_sh_fn);
-				my $ltmain_sh_body=<F>;
-				close F;
-				$ltmain_sh_body=~/object name conflicts; renaming object files/
-						or confess "'libtool' package version 1.5 or higher required";
+				# For conflicting object basenames in convenient libraries:
+				AutoGen->checkcommandversion("libtoolize","1.5");
+				# 1.5 for AM_PROG_AS.
+				# 1.6 to prevent weird error wrt 'SANDBOX_IDL_SOURCES':
+				AutoGen->checkcommandversion("automake","1.6");
+
+				AutoGen::_system "gtkdocize --copy --docdir doc/apiref/";
+				for my $fname ("doc/apiref/gtk-doc.make") {
+					my $gtk_doc_make=AutoGen::_readfile $fname;
+					for my $keyword (qw(EXTRA_DIST CLEANFILES)) {
+						$gtk_doc_make=~s/^$keyword =/$keyword +=/m or confess "$keyword not found in $fname";
+						}
+					$gtk_doc_make=~s/^(dist-hook): dist-check-gtkdoc (dist-hook-local)$/$1: $2\n\nDISABLED_$&/m;
+					AutoGen::_writefile "$fname-captive",$gtk_doc_make;
+					}
+				for my $dir ("./src/install/acquire/cabextract") {
+					if (!-f "$dir/cabextract.c" || -f "$dir/configure.in") {
+						do { system $_ and die "$_: $!"; } for ("cvs update -kk -r captive $dir");
+						}
+					}
 				1;
 				},
 		);