summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-01-04 22:01:51 -0500
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-01-05 20:47:09 -0500
commitd86271af64602e7c86c003b27f27c7216706ff96 (patch)
tree85fbafe3e91413308db2c3ad408900e1094d5f56 /scripts/kconfig
parentf7de64b73172e0c4cc900c14a432b76f0347ee9e (diff)
kconfig: rename generated .*conf-cfg to *conf-cfg
Remove the dot-prefixing since it is just a matter of the .gitignore file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/.gitignore1
-rw-r--r--scripts/kconfig/Makefile36
2 files changed, 19 insertions, 18 deletions
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 0aabc1d6a182..b5bf92f66d11 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -2,6 +2,7 @@
2# Generated files 2# Generated files
3# 3#
4*.moc 4*.moc
5*conf-cfg
5 6
6# 7#
7# configuration programs 8# configuration programs
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 679e62e5a15c..c05ab001b54c 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -157,53 +157,53 @@ conf-objs := conf.o $(common-objs)
157hostprogs-y += nconf 157hostprogs-y += nconf
158nconf-objs := nconf.o nconf.gui.o $(common-objs) 158nconf-objs := nconf.o nconf.gui.o $(common-objs)
159 159
160HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) 160HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs)
161HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) 161HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
162HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) 162HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
163 163
164$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg 164$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
165 165
166# mconf: Used for the menuconfig target based on lxdialog 166# mconf: Used for the menuconfig target based on lxdialog
167hostprogs-y += mconf 167hostprogs-y += mconf
168lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o 168lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
169mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) 169mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs)
170 170
171HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) 171HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
172$(foreach f, mconf.o $(lxdialog), \ 172$(foreach f, mconf.o $(lxdialog), \
173 $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags))) 173 $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
174 174
175$(obj)/mconf.o: $(obj)/.mconf-cfg 175$(obj)/mconf.o: $(obj)/mconf-cfg
176$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg 176$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg
177 177
178# qconf: Used for the xconfig target based on Qt 178# qconf: Used for the xconfig target based on Qt
179hostprogs-y += qconf 179hostprogs-y += qconf
180qconf-cxxobjs := qconf.o 180qconf-cxxobjs := qconf.o
181qconf-objs := images.o $(common-objs) 181qconf-objs := images.o $(common-objs)
182 182
183HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) 183HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs)
184HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) 184HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
185 185
186$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc 186$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
187 187
188quiet_cmd_moc = MOC $@ 188quiet_cmd_moc = MOC $@
189 cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@ 189 cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@
190 190
191$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg 191$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
192 $(call cmd,moc) 192 $(call cmd,moc)
193 193
194# gconf: Used for the gconfig target based on GTK+ 194# gconf: Used for the gconfig target based on GTK+
195hostprogs-y += gconf 195hostprogs-y += gconf
196gconf-objs := gconf.o images.o $(common-objs) 196gconf-objs := gconf.o images.o $(common-objs)
197 197
198HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) 198HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs)
199HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) 199HOSTCFLAGS_gconf.o = $(shell . $(obj)/gconf-cfg && echo $$cflags)
200 200
201$(obj)/gconf.o: $(obj)/.gconf-cfg 201$(obj)/gconf.o: $(obj)/gconf-cfg
202 202
203# check if necessary packages are available, and configure build flags 203# check if necessary packages are available, and configure build flags
204filechk_conf_cfg = $(CONFIG_SHELL) $< 204filechk_conf_cfg = $(CONFIG_SHELL) $<
205 205
206$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE 206$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
207 $(call filechk,conf_cfg) 207 $(call filechk,conf_cfg)
208 208
209clean-files += .*conf-cfg 209clean-files += conf-cfg