* [PATCH] kconfig: rename generated .*conf-cfg to *conf-cfg
@ 2019-01-05 3:01 Masahiro Yamada
2019-01-16 14:33 ` Masahiro Yamada
0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2019-01-05 3:01 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, linux-kernel
Remove the dot-prefixing since it is just a matter of the
.gitignore file.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/kconfig/.gitignore | 1 +
scripts/kconfig/Makefile | 36 ++++++++++++++++++------------------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 0aabc1d..b5bf92f 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -2,6 +2,7 @@
# Generated files
#
*.moc
+*conf-cfg
#
# configuration programs
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 679e62e..c05ab00 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -157,53 +157,53 @@ conf-objs := conf.o $(common-objs)
hostprogs-y += nconf
nconf-objs := nconf.o nconf.gui.o $(common-objs)
-HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
-HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
-HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
+HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs)
+HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
+HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
-$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
+$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
# mconf: Used for the menuconfig target based on lxdialog
hostprogs-y += mconf
lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs)
-HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
+HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
$(foreach f, mconf.o $(lxdialog), \
- $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
+ $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
-$(obj)/mconf.o: $(obj)/.mconf-cfg
-$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
+$(obj)/mconf.o: $(obj)/mconf-cfg
+$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg
# qconf: Used for the xconfig target based on Qt
hostprogs-y += qconf
qconf-cxxobjs := qconf.o
qconf-objs := images.o $(common-objs)
-HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
-HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
+HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs)
+HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
-$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
+$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
quiet_cmd_moc = MOC $@
- cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
+ cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@
-$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
+$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
$(call cmd,moc)
# gconf: Used for the gconfig target based on GTK+
hostprogs-y += gconf
gconf-objs := gconf.o images.o $(common-objs)
-HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
-HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
+HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs)
+HOSTCFLAGS_gconf.o = $(shell . $(obj)/gconf-cfg && echo $$cflags)
-$(obj)/gconf.o: $(obj)/.gconf-cfg
+$(obj)/gconf.o: $(obj)/gconf-cfg
# check if necessary packages are available, and configure build flags
filechk_conf_cfg = $(CONFIG_SHELL) $<
-$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
+$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
$(call filechk,conf_cfg)
-clean-files += .*conf-cfg
+clean-files += conf-cfg
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kconfig: rename generated .*conf-cfg to *conf-cfg
2019-01-05 3:01 [PATCH] kconfig: rename generated .*conf-cfg to *conf-cfg Masahiro Yamada
@ 2019-01-16 14:33 ` Masahiro Yamada
0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2019-01-16 14:33 UTC (permalink / raw)
To: Linux Kbuild mailing list; +Cc: Linux Kernel Mailing List
On Sat, Jan 5, 2019 at 12:02 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Remove the dot-prefixing since it is just a matter of the
> .gitignore file.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
Applied to linux-kbuild/fixes.
>
> scripts/kconfig/.gitignore | 1 +
> scripts/kconfig/Makefile | 36 ++++++++++++++++++------------------
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
> index 0aabc1d..b5bf92f 100644
> --- a/scripts/kconfig/.gitignore
> +++ b/scripts/kconfig/.gitignore
> @@ -2,6 +2,7 @@
> # Generated files
> #
> *.moc
> +*conf-cfg
>
> #
> # configuration programs
> diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
> index 679e62e..c05ab00 100644
> --- a/scripts/kconfig/Makefile
> +++ b/scripts/kconfig/Makefile
> @@ -157,53 +157,53 @@ conf-objs := conf.o $(common-objs)
> hostprogs-y += nconf
> nconf-objs := nconf.o nconf.gui.o $(common-objs)
>
> -HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
> -HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
> -HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
> +HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs)
> +HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
> +HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
>
> -$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
> +$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
>
> # mconf: Used for the menuconfig target based on lxdialog
> hostprogs-y += mconf
> lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
> mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs)
>
> -HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
> +HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
> $(foreach f, mconf.o $(lxdialog), \
> - $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
> + $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
>
> -$(obj)/mconf.o: $(obj)/.mconf-cfg
> -$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
> +$(obj)/mconf.o: $(obj)/mconf-cfg
> +$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg
>
> # qconf: Used for the xconfig target based on Qt
> hostprogs-y += qconf
> qconf-cxxobjs := qconf.o
> qconf-objs := images.o $(common-objs)
>
> -HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
> -HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
> +HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs)
> +HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
>
> -$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
> +$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
>
> quiet_cmd_moc = MOC $@
> - cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
> + cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@
>
> -$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
> +$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
> $(call cmd,moc)
>
> # gconf: Used for the gconfig target based on GTK+
> hostprogs-y += gconf
> gconf-objs := gconf.o images.o $(common-objs)
>
> -HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
> -HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
> +HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs)
> +HOSTCFLAGS_gconf.o = $(shell . $(obj)/gconf-cfg && echo $$cflags)
>
> -$(obj)/gconf.o: $(obj)/.gconf-cfg
> +$(obj)/gconf.o: $(obj)/gconf-cfg
>
> # check if necessary packages are available, and configure build flags
> filechk_conf_cfg = $(CONFIG_SHELL) $<
>
> -$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
> +$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
> $(call filechk,conf_cfg)
>
> -clean-files += .*conf-cfg
> +clean-files += conf-cfg
> --
> 2.7.4
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-16 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-05 3:01 [PATCH] kconfig: rename generated .*conf-cfg to *conf-cfg Masahiro Yamada
2019-01-16 14:33 ` Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.