merge: http://linuxtv.org/hg/~mcisely/v4l-dvb

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 10 insertions, 11 deletions

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 11392c32d..aebf2a950 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -14,7 +14,7 @@ sub add_bool($)
 	my $arg=shift;
 
 	$tristate{$arg}="bool";
-	printf "Boolean:%s\n",$arg;
+#	printf "Boolean:%s\n",$arg;
 }
 
 sub add_tristate($)
@@ -22,7 +22,7 @@ sub add_tristate($)
 	my $arg=shift;
 
 	$tristate{$arg}="tristate";
-	printf "Tristate:%s\n",$arg;
+#	printf "Tristate:%s\n",$arg;
 }
 
 sub add_config($)
@@ -154,7 +154,6 @@ print OUT "mainmenu \"V4L/DVB menu\"\n";
 
 print OUT "source Kconfig.kern\n";
 open_kconfig ("../linux","../linux/drivers/media/Kconfig");
-
 close OUT;
 
 while ( my ($key, $value) = each(%config) ) {
@@ -173,6 +172,10 @@ close OUT;
 
 if (($force_kconfig eq 1) || !open IN,".config") {
 	open OUT,">.config";
+	while ( my ($key, $value) = each(%depend) ) {
+		printf "CONFIG_%s=m\n",$key;
+		printf OUT "CONFIG_%s=m\n",$key;
+	}
 	while ( my ($key,$value) = each(%tristate) ) {
 
 		if ($key eq "DVB_AV7110_FIRMWARE") {
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 8371f6a4a..238c5082f 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -113,8 +113,9 @@ open OUT,">Makefile.media";
 open_makefile ("../linux/drivers/media/Makefile");
 
 # Creating Install rule
-printf OUT "install::\n";
-#printf OUT "\t@strip --strip-debug \$(inst-m)\n\n";
+printf OUT "media-install::\n";
+printf OUT "\t\@echo \"Stripping debug info from files:\"\n";
+printf OUT "\t\@strip --strip-debug \$(inst-m)\n\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
 	printf OUT "\t\@echo -e \"\\nInstalling \$(KDIR26)/$key files:\"\n";
@@ -127,7 +128,7 @@ while ( my ($key, $value) = each(%instdir) ) {
 printf OUT "\t/sbin/depmod -a \${KERNELRELEASE}\n\n";
 
 # Creating Remove rule
-printf OUT "remove rminstall::\n";
+printf OUT "media-rminstall::\n";
 printf OUT "\t\@echo -e \"\\nRemoving old \$(DEST) files\\n\"\n";
 
 while ( my ($key, $value) = each(%instdir) ) {
@@ -160,5 +161,3 @@ if (open OUT,".myconfig") {
 } else {
 	system "make allmodconfig";
 }
-
-
diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl
index 503653a4f..a81e157e2 100755
--- a/v4l/scripts/make_noconfig.pl
+++ b/v4l/scripts/make_noconfig.pl
@@ -31,9 +31,6 @@ while (<IN>) {
 	}
 	s/\n//;
 
-	if (m/DVB_AV7110_FIRMWARE/) {
-		next;
-	}
 	if (m/DVB_AV7110_FIRMWARE_FILE/) {
 		next;
 	}