Now it is harmless to add all host programs to hostprogs-y.
Unified · Split
| @@ -157,35 +157,7 @@ qconf-cxxobjs := qconf.o · 156 unmodified lines | |||
| 157 | qconf-objs := zconf.tab.o | 157 | qconf-objs := zconf.tab.o |
| 158 | gconf-objs := gconf.o zconf.tab.o | 158 | gconf-objs := gconf.o zconf.tab.o |
| 159 | 159 | ||
| 160 | hostprogs-y := conf | 160 | hostprogs-y := conf nconf mconf kxgettext qconf gconf |
| 161 | |||
| 162 | ifeq ($(MAKECMDGOALS),nconfig) | ||
| 163 | hostprogs-y += nconf | ||
| 164 | endif | ||
| 165 | |||
| 166 | ifeq ($(MAKECMDGOALS),menuconfig) | ||
| 167 | hostprogs-y += mconf | ||
| 168 | endif | ||
| 169 | |||
| 170 | ifeq ($(MAKECMDGOALS),update-po-config) | ||
| 171 | hostprogs-y += kxgettext | ||
| 172 | endif | ||
| 173 | |||
| 174 | ifeq ($(MAKECMDGOALS),xconfig) | ||
| 175 | qconf-target := 1 | ||
| 176 | endif | ||
| 177 | ifeq ($(MAKECMDGOALS),gconfig) | ||
| 178 | gconf-target := 1 | ||
| 179 | endif | ||
| 180 | |||
| 181 | |||
| 182 | ifeq ($(qconf-target),1) | ||
| 183 | hostprogs-y += qconf | ||
| 184 | endif | ||
| 185 | |||
| 186 | ifeq ($(gconf-target),1) | ||
| 187 | hostprogs-y += gconf | ||
| 188 | endif | ||
| 189 | 161 | ||
| 190 | clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck | 162 | clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck |
| 191 | clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h | 163 | clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h |
| @@ -224,7 +196,7 @@ HOSTLOADLIBES_nconf = $(shell \ · 32 unmodified lines | |||
| 224 | || echo "-lmenu -lpanel -lncurses" ) | 196 | || echo "-lmenu -lpanel -lncurses" ) |
| 225 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 197 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
| 226 | 198 | ||
| 227 | ifeq ($(qconf-target),1) | 199 | ifeq ($(MAKECMDGOALS),xconfig) |
| 228 | $(obj)/.tmp_qtcheck: $(src)/Makefile | 200 | $(obj)/.tmp_qtcheck: $(src)/Makefile |
| 229 | -include $(obj)/.tmp_qtcheck | 201 | -include $(obj)/.tmp_qtcheck |
| 230 | 202 | ||
| @@ -281,7 +253,7 @@ endif · 50 unmodified lines | |||
| 281 | 253 | ||
| 282 | $(obj)/gconf.o: $(obj)/.tmp_gtkcheck | 254 | $(obj)/gconf.o: $(obj)/.tmp_gtkcheck |
| 283 | 255 | ||
| 284 | ifeq ($(gconf-target),1) | 256 | ifeq ($(MAKECMDGOALS),gconfig) |
| 285 | -include $(obj)/.tmp_gtkcheck | 257 | -include $(obj)/.tmp_gtkcheck |
| 286 | 258 | ||
| 287 | # GTK needs some extra effort, too... | 259 | # GTK needs some extra effort, too... |