diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 10:04:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 10:04:08 -0300 |
| commit | 74e1ed0781b35cfd53baba71c84dfbf6c59c5403 (patch) | |
| tree | 7cfbd36708f56638cde68712349579b8b2d2ae16 | |
| parent | f6f911fb4b41a2ca2b6f03717a0964b40e2f4648 (diff) | |
| download | mediapointer-dvb-s2-74e1ed0781b35cfd53baba71c84dfbf6c59c5403.tar.gz mediapointer-dvb-s2-74e1ed0781b35cfd53baba71c84dfbf6c59c5403.tar.bz2 | |
Fixes circular dependencies at building system
From: Mauro Carvalho Chehab <mchehab@infradead.org>
There were a circular dependency at scripts/make_makefile.pl that were
affecting mostly building with GNU make 3.81.
Also, scripts/make_noconfig.pl is, in fact, building .myconfig file, so,
better to name it as make_myconfig.pl.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | v4l/Makefile | 14 | ||||
| -rwxr-xr-x | v4l/scripts/make_makefile.pl | 2 | ||||
| -rwxr-xr-x | v4l/scripts/make_myconfig.pl (renamed from v4l/scripts/make_noconfig.pl) | 0 |
3 files changed, 9 insertions, 7 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index d20e68d4e..27a79a181 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -180,7 +180,9 @@ links:: @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; @find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \; -config-compat.h:: .myconfig +config-compat.h:: + scripts/make_myconfig.pl + @echo \#ifndef __CONFIG_COMPAT_H__ > config-compat.h @echo \#define __CONFIG_COMPAT_H__ >> config-compat.h @echo >> config-compat.h @@ -253,26 +255,26 @@ LXDIALOG := $(KDIR)/scripts/$(LXDIALOG_DIR)lxdialog/lxdialog xconfig:: links .version $(QCONF) ./scripts/make_kconfig.pl $(QCONF) Kconfig - ./scripts/make_noconfig.pl + ./scripts/make_myconfig.pl gconfig:: links .version $(GCONF) ./scripts/make_kconfig.pl $(QCONF) Kconfig - ./scripts/make_noconfig.pl + ./scripts/make_myconfig.pl config:: links .version $(CONF) ./scripts/make_kconfig.pl $(CONF) Kconfig - ./scripts/make_noconfig.pl + ./scripts/make_myconfig.pl menuconfig:: links .version $(MCONF) lxdialog ./scripts/make_kconfig.pl $(MCONF) Kconfig - ./scripts/make_noconfig.pl + ./scripts/make_myconfig.pl allyesconfig allmodconfig:: links .version ./scripts/make_kconfig.pl 1 - ./scripts/make_noconfig.pl + ./scripts/make_myconfig.pl # rule to build kernel conf programs KMAKEVARS := config-targets=1 mixed-targets=0 dot-config=0 diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index bcfb3764f..f0d9aef7f 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -181,5 +181,5 @@ if (open IN,"Makefile.media") { if (open IN,".myconfig") { close IN; } else { - system "make allmodconfig"; + system "./scripts/make_kconfig.pl 1"; } diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_myconfig.pl index 7323f419c..7323f419c 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_myconfig.pl |