Commit d86271af authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent f7de64b7

scripts/kconfig/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Generated files

#

*.moc

*conf-cfg



#

# configuration programs

scripts/kconfig/Makefile

+18 −18
Original line number Diff line number Diff line
@@ -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