Skip to content

Commit d86271a

Browse files
committed
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 <[email protected]>
1 parent f7de64b commit d86271a

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

scripts/kconfig/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Generated files
33
#
44
*.moc
5+
*conf-cfg
56

67
#
78
# configuration programs

scripts/kconfig/Makefile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,53 +157,53 @@ conf-objs := conf.o $(common-objs)
157157
hostprogs-y += nconf
158158
nconf-objs := nconf.o nconf.gui.o $(common-objs)
159159

160-
HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
161-
HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
162-
HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
160+
HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs)
161+
HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
162+
HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/nconf-cfg && echo $$cflags)
163163

164-
$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
164+
$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
165165

166166
# mconf: Used for the menuconfig target based on lxdialog
167167
hostprogs-y += mconf
168168
lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
169169
mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs)
170170

171-
HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
171+
HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
172172
$(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)))
174174

175-
$(obj)/mconf.o: $(obj)/.mconf-cfg
176-
$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
175+
$(obj)/mconf.o: $(obj)/mconf-cfg
176+
$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg
177177

178178
# qconf: Used for the xconfig target based on Qt
179179
hostprogs-y += qconf
180180
qconf-cxxobjs := qconf.o
181181
qconf-objs := images.o $(common-objs)
182182

183-
HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
184-
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
183+
HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs)
184+
HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
185185

186-
$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
186+
$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
187187

188188
quiet_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 $@
190190

191-
$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
191+
$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
192192
$(call cmd,moc)
193193

194194
# gconf: Used for the gconfig target based on GTK+
195195
hostprogs-y += gconf
196196
gconf-objs := gconf.o images.o $(common-objs)
197197

198-
HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
199-
HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
198+
HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs)
199+
HOSTCFLAGS_gconf.o = $(shell . $(obj)/gconf-cfg && echo $$cflags)
200200

201-
$(obj)/gconf.o: $(obj)/.gconf-cfg
201+
$(obj)/gconf.o: $(obj)/gconf-cfg
202202

203203
# check if necessary packages are available, and configure build flags
204204
filechk_conf_cfg = $(CONFIG_SHELL) $<
205205

206-
$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
206+
$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
207207
$(call filechk,conf_cfg)
208208

209-
clean-files += .*conf-cfg
209+
clean-files += conf-cfg

0 commit comments

Comments
 (0)