From 366fa98a817c19558aaa09755a2ce12931a35f3d Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 27 Apr 2006 09:30:20 -0400 Subject: move install / rminstall invocation rules to v4l/Makefile From: Michael Krufky This patch moves the 'make install' and 'make rminstall' rules into the central Makefile. This allows for us to assign dependencies to these rules, so that modules built as a reult of a tree-merge don't have to be installed separately. Now, instead of doing 'make install && make ivtv-install', the simple command, 'make install' will call the sub-install rules and take care of the entire task. Signed-off-by: Michael Krufky --- v4l/Makefile | 7 +++++++ v4l/scripts/make_makefile.pl | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 7814c6799..c57767940 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -114,6 +114,13 @@ export LC_ALL all:: allmodconfig default +################################################# +# installation invocation rules + +install:: media-install ivtv-install + +remove rminstall:: media-rminstall ivtv-rminstall + ################################################# # Compiling preparation rules diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 6b8076a4d..238c5082f 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -113,7 +113,7 @@ open OUT,">Makefile.media"; open_makefile ("../linux/drivers/media/Makefile"); # Creating Install rule -printf OUT "install::\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"; @@ -128,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) ) { -- cgit v1.2.3