use NO_TRACE_MAKE for menuconfig

[openwrt-10.03/.git] / scripts / gen_menuconfig.pl

diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index c40e1caedce46dfed3c26b0fe4e40ee57918e328..c1510b0d5842ec6f5c977726a6ad021b53c533a5 100755 (executable)
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -5,6 +5,7 @@ my $src;
 my $makefile;
 my $pkg;
 my %category;
+my $cur_menu;
 
 sub print_category($) {
        my $cat = shift;
@@ -15,6 +16,16 @@ sub print_category($) {
        my %spkg = %{$category{$cat}};
        foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
                foreach my $pkg (@{$spkg{$spkg}}) {
+                       if ($cur_menu ne $pkg->{submenu}) {
+                               if ($cur_menu) {
+                                       print "endmenu\n";
+                                       undef $cur_menu;
+                               } 
+                               if ($pkg->{submenu}) {
+                                       $cur_menu = $pkg->{submenu};
+                                       print "menu \"$cur_menu\"\n";
+                               }
+                       }
                        my $title = $pkg->{name};
                        my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
                        if ($c > 0) {
@@ -29,7 +40,7 @@ sub print_category($) {
                        }
                        foreach my $depend (@{$pkg->{depends}}) {
                                my $m = "depends";
-                               $depend =~ s/^([@\+])//;
+                               $depend =~ s/^([@\+]+)//;
                                my $flags = $1;
                                $flags =~ /@/ or $depend = "PACKAGE_$depend";
                                $flags =~ /\+/ and $m = "select";
@@ -65,6 +76,7 @@ while ($line = <>) {
        $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
        $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
        $line =~ /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
+       $line =~ /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
        $line =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
        $line =~ /^Depends: \s*(.+)\s*$/ and do {
                my @dep = split /\s+/, $1;