erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This patch fixes "make gconfig". It also moves all files to their

Browse source 
according subdirectories in $(obj)/util/kconfig[/lxdialog]

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@241 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-03-11 16:04:05 +00:00
commit e9f291869e
5 changed files with 71 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

106
util/kconfig/Makefile
View file

@ -17,44 +17,46 @@
.PHONY: oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
xconfig: $(obj)/.tmp_qtcheck $(obj)/qconf
$(Q)$(obj)/qconf Kconfig
xconfig: $(obj)/util/kconfig/.tmp_qtcheck $(obj)/util/kconfig/qconf
$(Q)$(obj)/util/kconfig/qconf Kconfig
gconfig: $(obj)/gconf
$(Q)$(obj)/gconf Kconfig
gconfig: prepare $(obj)/util/kconfig/.tmp_gtkcheck $(obj)/util/kconfig/gconf
$(Q)$(obj)/util/kconfig/gconf Kconfig
menuconfig: prepare $(obj)/lxdialog $(obj)/mconf
$(Q)$(obj)/mconf Kconfig
menuconfig: prepare $(obj)/util/kconfig/lxdialog/lxdialog $(obj)/util/kconfig/mconf
$(Q)$(obj)/util/kconfig/mconf Kconfig
config: prepare $(obj)/conf
$(Q)$(obj)/conf Kconfig
config: prepare $(obj)/util/kconfig/conf
$(Q)$(obj)/util/kconfig/conf Kconfig
oldconfig: prepare $(obj)/conf
$(Q)$(obj)/conf -o Kconfig
oldconfig: prepare $(obj)/util/kconfig/conf
$(Q)$(obj)/util/kconfig/conf -o Kconfig
silentoldconfig: prepare $(obj)/conf
$(Q)$(obj)/conf -s Kconfig
silentoldconfig: prepare $(obj)/util/kconfig/conf
$(Q)$(obj)/util/kconfig/conf -s Kconfig
.PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
randconfig: $(obj)/conf
randconfig: $(obj)/util/kconfig/conf
$(Q)$< -r Kconfig
allyesconfig: $(obj)/conf
allyesconfig: $(obj)/util/kconfig/conf
$(Q)$< -y Kconfig
allnoconfig: $(obj)/conf
allnoconfig: $(obj)/util/kconfig/conf
$(Q)$< -n Kconfig
allmodconfig: $(obj)/conf
allmodconfig: $(obj)/util/kconfig/conf
$(Q)$< -m Kconfig
UNAME_RELEASE := $(shell uname -r)
#CLONECONFIG := $(firstword $(wildcard /proc/config.gz \
# /lib/modules/$(UNAME_RELEASE)/.config \
# /etc/kernel-config \
# /boot/config-$(UNAME_RELEASE)))
cloneconfig: $(obj)/conf
cloneconfig: $(obj)/util/kconfig/conf
$(Q)case "$(CLONECONFIG)" in \
'') echo -e "The configuration of the running" \
"firmware could not be determined\n"; \
@ -65,7 +67,7 @@ cloneconfig: $(obj)/conf
echo -e "Cloning configuration file $(CLONECONFIG)\n"
$(Q)$< -D .config.running Kconfig
defconfig: $(obj)/conf
defconfig: $(obj)/util/kconfig/conf
ifeq ($(KBUILD_DEFCONFIG),)
$< -d Kconfig
else
@ -73,7 +75,7 @@ else
$(Q)$< -D configs/$(KBUILD_DEFCONFIG) Kconfig
endif
%_defconfig: $(obj)/conf
%_defconfig: $(obj)/util/kconfig/conf
$(Q)$< -D configs/$@ Kconfig
# Help text used by make help
@ -94,51 +96,64 @@ conf-objects := conf.o zconf.tab.o
qconf-objects := qconf.o kconfig_load.o zconf.tab.o
gconf-objects := gconf.o kconfig_load.o zconf.tab.o
$(obj)/mconf: $(patsubst %,$(obj)/%,$(mconf-objects))
$(obj)/util/kconfig/mconf: $(patsubst %,$(obj)/util/kconfig/%,$(mconf-objects))
$(Q)$(HOSTCC) -lncurses -o $@ $^
$(obj)/conf: $(patsubst %,$(obj)/%,$(conf-objects))
$(obj)/util/kconfig/conf: $(patsubst %,$(obj)/util/kconfig/%,$(conf-objects))
$(Q)$(HOSTCC) -lncurses -o $@ $^
$(obj)/qconf: $(patsubst %,$(obj)/%,$(qconf-objects))
$(obj)/util/kconfig/qconf: $(patsubst %,$(obj)/util/kconfig/%,$(qconf-objects))
$(Q)$(HOSTCXX) $(KC_QT_LIBS) -ldl -o $@ $^
$(obj)/gconf: $(patsubst %,$(obj)/%,$(gconf-objects))
$(obj)/util/kconfig/gconf: $(patsubst %,$(obj)/util/kconfig/%,$(gconf-objects))
$(Q)$(HOSTCC) `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -o $@ $^
$(obj)/mconf.o: $(src)/util/kconfig/mconf.c
$(obj)/util/kconfig/mconf.o: $(src)/util/kconfig/mconf.c
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCC) -I$(src)/util/kconfig -c -o $@ $<
$(obj)/conf.o: $(src)/util/kconfig/conf.c
$(obj)/util/kconfig/conf.o: $(src)/util/kconfig/conf.c
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCC) -I$(src)/util/kconfig -c -o $@ $<
$(obj)/kconfig_load.o: $(src)/util/kconfig/kconfig_load.c
$(Q)$(HOSTCC) -I$(obj) -I$(src)/util/kconfig -c -o $@ $<
$(obj)/util/kconfig/kconfig_load.o: $(src)/util/kconfig/kconfig_load.c
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCC) -I$(obj)/util/kconfig -I$(src)/util/kconfig -c -o $@ $<
$(obj)/qconf.o: $(src)/util/kconfig/qconf.cc $(obj)/qconf.moc $(obj)/lkc_defs.h
$(obj)/util/kconfig/qconf.o: $(src)/util/kconfig/qconf.cc $(obj)/util/kconfig/qconf.moc $(obj)/util/kconfig/lkc_defs.h
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCXX) $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK \
-I$(src)/util/kconfig -I$(obj) -c -o $@ $<
-I$(src)/util/kconfig -I$(obj)/util/kconfig -c -o $@ $<
$(obj)/gconf.o: $(obj)/lkc_defs.h
$(obj)/util/kconfig/gconf.o: $(src)/util/kconfig/gconf.c $(obj)/util/kconfig/lkc_defs.h
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCC) `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-D LKC_DIRECT_LINK -I$(obj) -I$(src)/util/kconfig -c -o $@ $<
$(obj)/%.moc: $(src)/util/kconfig/%.h
$(obj)/util/kconfig/%.moc: $(src)/util/kconfig/%.h
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(KC_QT_MOC) -i $< -o $@
$(obj)/lkc_defs.h: $(src)/util/kconfig/lkc_proto.h
$(obj)/util/kconfig/lkc_defs.h: $(src)/util/kconfig/lkc_proto.h
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
$(obj)/zconf.tab.o: $(obj)/zconf.tab.c $(obj)/zconf.hash.c $(obj)/lex.zconf.c
$(Q)$(HOSTCC) -I$(src)/util/kconfig -c -o $@ $(obj)/zconf.tab.c
$(obj)/util/kconfig/zconf.tab.o: $(obj)/util/kconfig/zconf.tab.c $(obj)/util/kconfig/zconf.hash.c $(obj)/util/kconfig/lex.zconf.c
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)$(HOSTCC) -I$(src)/util/kconfig -c -o $@ $(obj)/util/kconfig/zconf.tab.c
$(obj)/lex.zconf.c: $(src)/util/kconfig/lex.zconf.c_shipped
$(obj)/util/kconfig/lex.zconf.c: $(src)/util/kconfig/lex.zconf.c_shipped
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)cp $< $@
$(obj)/zconf.hash.c: $(src)/util/kconfig/zconf.hash.c_shipped
$(obj)/util/kconfig/zconf.hash.c: $(src)/util/kconfig/zconf.hash.c_shipped
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)cp $< $@
$(obj)/zconf.tab.c: $(src)/util/kconfig/zconf.tab.c_shipped
$(obj)/util/kconfig/zconf.tab.c: $(src)/util/kconfig/zconf.tab.c_shipped
$(Q)mkdir -p $(obj)/util/kconfig
$(Q)cp $< $@
include $(src)/util/kconfig/lxdialog/Makefile
@ -169,12 +184,12 @@ endif
ifeq ($(qconf-target),1)
$(obj)/.tmp_qtcheck: $(src)/util/kconfig/Makefile
$(obj)/util/kconfig/.tmp_qtcheck: $(src)/util/kconfig/Makefile
-include $(obj)/.tmp_qtcheck
-include $(obj)/util/kconfig/.tmp_qtcheck
# QT needs some extra effort...
$(obj)/.tmp_qtcheck:
$(obj)/util/kconfig/.tmp_qtcheck:
@set -e; echo " CHECK qt"; dir=""; pkg=""; \
pkg-config --exists qt 2> /dev/null && pkg=qt; \
pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
@ -211,22 +226,23 @@ $(obj)/.tmp_qtcheck:
echo "*"; \
moc="/usr/bin/moc"; \
fi; \
mkdir -p $(obj); \
mkdir -p $(obj)/util/kconfig; \
echo "KC_QT_CFLAGS=$$cflags" > $@; \
echo "KC_QT_LIBS=$$libs" >> $@; \
echo "KC_QT_MOC=$$moc" >> $@
endif
ifeq ($(gconf-target),1)
$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
$(obj)/util/kconfig/.tmp_gtkcheck: $(src)/util/kconfig/Makefile
-include $(obj)/.tmp_gtkcheck
-include $(obj)/util/kconfig/.tmp_gtkcheck
# GTK needs some extra effort, too...
$(obj)/.tmp_gtkcheck:
$(obj)/util/kconfig/.tmp_gtkcheck:
@if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \
if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \
touch $@; \
mkdir -p $(obj)/util/kconfig; \
touch $@; \
else \
echo "*"; \
echo "* GTK+ is present but version >= 2.0.0 is required."; \

2
util/kconfig/gconf.c
View file

@ -1596,7 +1596,7 @@ int main(int ac, char *av[])
/* Determine GUI path */
env = getenv(SRCTREE);
if (env)
glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
glade_file = g_strconcat(env, "/util/kconfig/gconf.glade", NULL);
else if (av[0][0] == '/')
glade_file = g_strconcat(av[0], ".glade", NULL);
else

2
util/kconfig/lkc.h
View file

@ -29,7 +29,7 @@ extern "C" {
#include "lkc_proto.h"
#undef P
#define SRCTREE "srctree"
#define SRCTREE "src"
#define PACKAGE "linux"
#define LOCALEDIR "/usr/share/locale"

36
util/kconfig/lxdialog/Makefile
View file

@ -5,7 +5,7 @@ CONFIG_SHELL:=sh
check-lxdialog := $(src)/util/kconfig/lxdialog/check-lxdialog.sh
# Use reursively expanded variables so we do not call gcc unless
# Use recursively expanded variables so we do not call gcc unless
# we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@ -16,39 +16,17 @@ HOST_EXTRACFLAGS += -DLOCALE
$(obj)/dochecklxdialog:
$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
hostprogs-y := lxdialog
always := $(hostprogs-y) dochecklxdialog
always := lxdialog dochecklxdialog
lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
util.o lxdialog.o msgbox.o
$(obj)/util/kconfig/lxdialog/lxdialog: $(obj)/dochecklxdialog $(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs))
$(Q)$(HOSTCC) $(HOST_LOADLIBES) \
$(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) -o $@
$(obj)/lxdialog: $(obj)/dochecklxdialog $(patsubst %,$(obj)/%,$(lxdialog-objs))
$(Q)$(HOSTCC) $(HOST_LOADLIBES) $(patsubst %,$(obj)/%,$(lxdialog-objs)) -o $@
$(obj)/checklist.o: $(src)/util/kconfig/lxdialog/checklist.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/menubox.o: $(src)/util/kconfig/lxdialog/menubox.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/textbox.o: $(src)/util/kconfig/lxdialog/textbox.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/yesno.o: $(src)/util/kconfig/lxdialog/yesno.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/inputbox.o: $(src)/util/kconfig/lxdialog/inputbox.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/util.o: $(src)/util/kconfig/lxdialog/util.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/lxdialog.o: $(src)/util/kconfig/lxdialog/lxdialog.c
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(obj)/msgbox.o: $(src)/util/kconfig/lxdialog/msgbox.c
$(obj)/util/kconfig/lxdialog/%.o: $(src)/util/kconfig/lxdialog/%.c
$(Q)mkdir -p $(obj)/util/kconfig/lxdialog/
$(Q)$(HOSTCC) $(HOST_EXTRACFLAGS) $^ -c -o $@

2
util/kconfig/mconf.c
View file

@ -327,7 +327,7 @@ static void cprint_init(void)
memset(args, 0, sizeof(args));
indent = 0;
child_count = 0;
cprint("%s/lxdialog", mconf_lxdialogpath);
cprint("%s/util/kconfig/lxdialog/lxdialog", mconf_lxdialogpath);
cprint("--backtitle");
cprint(menu_backtitle);
}