diff options
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/Makefile | 6 | ||||
| -rw-r--r-- | scripts/kconfig/confdata.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/Makefile | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 5760e057ecb..e6499db4c8c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Kernel configuration targets | 2 | # Kernel configuration targets |
| 3 | # These targets are used from top-level makefile | 3 | # These targets are used from top-level makefile |
| 4 | 4 | ||
| 5 | .PHONY: oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config | 5 | PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config |
| 6 | 6 | ||
| 7 | xconfig: $(obj)/qconf | 7 | xconfig: $(obj)/qconf |
| 8 | $< arch/$(ARCH)/Kconfig | 8 | $< arch/$(ARCH)/Kconfig |
| @@ -42,7 +42,7 @@ update-po-config: $(obj)/kxgettext | |||
| 42 | $(Q)rm -f arch/um/Kconfig_arch | 42 | $(Q)rm -f arch/um/Kconfig_arch |
| 43 | $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot | 43 | $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot |
| 44 | 44 | ||
| 45 | .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig | 45 | PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig |
| 46 | 46 | ||
| 47 | randconfig: $(obj)/conf | 47 | randconfig: $(obj)/conf |
| 48 | $< -r arch/$(ARCH)/Kconfig | 48 | $< -r arch/$(ARCH)/Kconfig |
| @@ -78,7 +78,7 @@ help: | |||
| 78 | @echo ' defconfig - New config with default answer to all options' | 78 | @echo ' defconfig - New config with default answer to all options' |
| 79 | @echo ' allmodconfig - New config selecting modules when possible' | 79 | @echo ' allmodconfig - New config selecting modules when possible' |
| 80 | @echo ' allyesconfig - New config where all options are accepted with yes' | 80 | @echo ' allyesconfig - New config where all options are accepted with yes' |
| 81 | @echo ' allnoconfig - New minimal config' | 81 | @echo ' allnoconfig - New config where all options are answered with no' |
| 82 | 82 | ||
| 83 | # =========================================================================== | 83 | # =========================================================================== |
| 84 | # Shared Makefile for the various kconfig executables: | 84 | # Shared Makefile for the various kconfig executables: |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index b0cbbe2e41b..1b8882ddbc7 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -374,6 +374,7 @@ int conf_write(const char *name) | |||
| 374 | out_h = fopen(".tmpconfig.h", "w"); | 374 | out_h = fopen(".tmpconfig.h", "w"); |
| 375 | if (!out_h) | 375 | if (!out_h) |
| 376 | return 1; | 376 | return 1; |
| 377 | file_write_dep(NULL); | ||
| 377 | } | 378 | } |
| 378 | sym = sym_lookup("KERNELVERSION", 0); | 379 | sym = sym_lookup("KERNELVERSION", 0); |
| 379 | sym_calc_value(sym); | 380 | sym_calc_value(sym); |
| @@ -512,7 +513,6 @@ int conf_write(const char *name) | |||
| 512 | if (out_h) { | 513 | if (out_h) { |
| 513 | fclose(out_h); | 514 | fclose(out_h); |
| 514 | rename(".tmpconfig.h", "include/linux/autoconf.h"); | 515 | rename(".tmpconfig.h", "include/linux/autoconf.h"); |
| 515 | file_write_dep(NULL); | ||
| 516 | } | 516 | } |
| 517 | if (!name || basename != conf_def_filename) { | 517 | if (!name || basename != conf_def_filename) { |
| 518 | if (!name) | 518 | if (!name) |
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile index bbf4887cff7..a8b02632624 100644 --- a/scripts/kconfig/lxdialog/Makefile +++ b/scripts/kconfig/lxdialog/Makefile | |||
| @@ -7,10 +7,10 @@ check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh | |||
| 7 | # we really need to do so. (Do not call gcc as part of make mrproper) | 7 | # we really need to do so. (Do not call gcc as part of make mrproper) |
| 8 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) | 8 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) |
| 9 | HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | 9 | HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) |
| 10 | |||
| 11 | HOST_EXTRACFLAGS += -DLOCALE | ||
| 12 | 10 | ||
| 13 | .PHONY: dochecklxdialog | 11 | HOST_EXTRACFLAGS += -DLOCALE |
| 12 | |||
| 13 | PHONY += dochecklxdialog | ||
| 14 | $(obj)/dochecklxdialog: | 14 | $(obj)/dochecklxdialog: |
| 15 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES) | 15 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES) |
| 16 | 16 | ||
