diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-27 09:30:20 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-27 09:30:20 -0400 |
| commit | 366fa98a817c19558aaa09755a2ce12931a35f3d (patch) | |
| tree | a3cfaf3b8e7e0f90b9fa2276a14cf5bc033d00de /v4l | |
| parent | e6f2467bcc7b9ca1e7de8cd2ea21b2af83892c9d (diff) | |
| download | mediapointer-dvb-s2-366fa98a817c19558aaa09755a2ce12931a35f3d.tar.gz mediapointer-dvb-s2-366fa98a817c19558aaa09755a2ce12931a35f3d.tar.bz2 | |
move install / rminstall invocation rules to v4l/Makefile
From: Michael Krufky <mkrufky@linuxtv.org>
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 <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 7 | ||||
| -rwxr-xr-x | v4l/scripts/make_makefile.pl | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 7814c6799..c57767940 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -115,6 +115,13 @@ export LC_ALL all:: allmodconfig default ################################################# +# installation invocation rules + +install:: media-install ivtv-install + +remove rminstall:: media-rminstall ivtv-rminstall + +################################################# # Compiling preparation rules Makefile.media:: 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) ) { |