diff options
| -rw-r--r-- | scripts/kconfig/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 36 |
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) | |||
| 157 | hostprogs-y += nconf | 157 | hostprogs-y += nconf |
| 158 | nconf-objs := nconf.o nconf.gui.o $(common-objs) | 158 | nconf-objs := nconf.o nconf.gui.o $(common-objs) |
| 159 | 159 | ||
| 160 | HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) | 160 | HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs) |
| 161 | HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) | 161 | HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags) |
| 162 | HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) | 162 | HOSTCFLAGS_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 |
| 167 | hostprogs-y += mconf | 167 | hostprogs-y += mconf |
| 168 | lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o | 168 | lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o |
| 169 | mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) | 169 | mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) |
| 170 | 170 | ||
| 171 | HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) | 171 | HOSTLDLIBS_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 |
| 179 | hostprogs-y += qconf | 179 | hostprogs-y += qconf |
| 180 | qconf-cxxobjs := qconf.o | 180 | qconf-cxxobjs := qconf.o |
| 181 | qconf-objs := images.o $(common-objs) | 181 | qconf-objs := images.o $(common-objs) |
| 182 | 182 | ||
| 183 | HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) | 183 | HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs) |
| 184 | HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) | 184 | HOSTCXXFLAGS_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 | ||
| 188 | quiet_cmd_moc = MOC $@ | 188 | 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 $@ |
| 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+ |
| 195 | hostprogs-y += gconf | 195 | hostprogs-y += gconf |
| 196 | gconf-objs := gconf.o images.o $(common-objs) | 196 | gconf-objs := gconf.o images.o $(common-objs) |
| 197 | 197 | ||
| 198 | HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) | 198 | HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs) |
| 199 | HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) | 199 | HOSTCFLAGS_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 |
| 204 | filechk_conf_cfg = $(CONFIG_SHELL) $< | 204 | filechk_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 | ||
| 209 | clean-files += .*conf-cfg | 209 | clean-files += conf-cfg |
