X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fgen_deps.pl;h=d75f06d6f6f8a99f02a82bb6681a8f665fdf16a1;hb=e240cc0ea62aa7404ccf6187cc95cf6370212bef;hp=a910a9937bbdebbc77fe9ef7adcdf9a9de3a039a;hpb=282c15a0b057d58441c62f88048e906ffdf4e834;p=openwrt-10.03%2F.git

diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl
index a910a9937..d75f06d6f 100755
--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -5,6 +5,7 @@ my $name;
 my $src;
 my $makefile;
 my %pkg;
+my %dep;
 
 my $line;
 while ($line = <>) {
@@ -18,22 +19,41 @@ while ($line = <>) {
 		defined $pkg{$name} or $pkg{$name} = {};
 		$pkg{$name}->{src} = $src;
 	};
-	$line =~ /^Depends: \s*(.+)\s*$/ and do {
-		my @dep = split /,\s*/, $1;
-		$pkg{$name}->{depends} = \@dep;
+	$line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do {
+		$pkg{$name}->{depends} ||= [];
+		foreach my $v (split /\s+/, $2) {
+			next if $v =~ /^@/;
+			$v =~ s/^\+//;
+			push @{$pkg{$name}->{depends}}, $v;
+		}
 	};
 }
 
+$line="";
+
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
+	print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+
 	my $hasdeps = 0;
-	$line = "$pkg{$name}->{src}-compile:";
+	my $depline = "";
 	foreach my $dep (@{$pkg{$name}->{depends}}) {
+		my $idx;
 	        if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
-			$hasdeps = 1;
-			$line .= " $pkg{$dep}->{src}-compile";
+			$idx = $pkg{$dep}->{src};
+		} elsif (defined $pkg{$dep}) {
+			$idx = $dep;
+		}
+		if ($idx) {
+			next if $dep{$pkg{$name}->{src}."->".$idx};
+			$depline .= " $idx\-compile";
+			$dep{$pkg{$name}->{src}."->".$idx} = 1;
 		}
 	}
-	if ($hasdeps) {
-		print "$line\n";
+	if ($depline ne "") {
+		$line .= "$pkg{$name}->{src}-compile: $depline\n";
 	}
 }
+
+if ($line ne "") {
+	print "\n$line";
+}