Commit f4f01597 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] gtk front end

This adds the gtk front end by Romain Liévin <roms@tilp.info>
parent 6faef31d
...@@ -198,7 +198,7 @@ export MODVERDIR := .tmp_versions ...@@ -198,7 +198,7 @@ export MODVERDIR := .tmp_versions
comma := , comma := ,
depfile = $(subst $(comma),_,$(@D)/.$(@F).d) depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
noconfig_targets := xconfig menuconfig config oldconfig randconfig \ noconfig_targets := xconfig gconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig \ defconfig allyesconfig allnoconfig allmodconfig \
clean mrproper distclean rpm \ clean mrproper distclean rpm \
help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \ help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \
...@@ -604,15 +604,18 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) ...@@ -604,15 +604,18 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
# Kernel configuration # Kernel configuration
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
.PHONY: oldconfig xconfig menuconfig config \ .PHONY: oldconfig xconfig gconfig menuconfig config \
make_with_config rpm make_with_config rpm
scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf scripts/kconfig/gconf: scripts/fixdep FORCE
$(Q)$(MAKE) $(build)=scripts/kconfig $@ $(Q)$(MAKE) $(build)=scripts/kconfig $@
xconfig: scripts/kconfig/qconf xconfig: scripts/kconfig/qconf
./scripts/kconfig/qconf arch/$(ARCH)/Kconfig ./scripts/kconfig/qconf arch/$(ARCH)/Kconfig
gconfig: scripts/kconfig/gconf
./scripts/kconfig/gconf arch/$(ARCH)/Kconfig
menuconfig: scripts/kconfig/mconf menuconfig: scripts/kconfig/mconf
$(Q)$(MAKE) $(build)=scripts/lxdialog $(Q)$(MAKE) $(build)=scripts/lxdialog
./scripts/kconfig/mconf arch/$(ARCH)/Kconfig ./scripts/kconfig/mconf arch/$(ARCH)/Kconfig
......
...@@ -6,20 +6,29 @@ ...@@ -6,20 +6,29 @@
# Utilizes the lxdialog package # Utilizes the lxdialog package
# qconf: Used for the xconfig target # qconf: Used for the xconfig target
# Based on QT which needs to be installed to compile it # Based on QT which needs to be installed to compile it
# gconf: Used for the gconfig target
# Based on GTK which needs to be installed to compile it
# #
#################
# object files used by all lkc flavours # object files used by all lkc flavours
libkconfig-objs := zconf.tab.o libkconfig-objs := zconf.tab.o
host-progs := conf mconf qconf host-progs := conf mconf qconf gconf
conf-objs := conf.o libkconfig.so conf-objs := conf.o libkconfig.so
mconf-objs := mconf.o libkconfig.so mconf-objs := mconf.o libkconfig.so
qconf-objs := kconfig_load.o ifeq ($(MAKECMDGOALS),$(obj)/qconf)
qconf-cxxobjs := qconf.o qconf-cxxobjs := qconf.o
qconf-objs := kconfig_load.o
endif
ifeq ($(MAKECMDGOALS),$(obj)/gconf)
gconf-objs := gconf.o kconfig_load.o
endif
clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \ clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
zconf.tab.c zconf.tab.h lex.zconf.c .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
# generated files seem to need this to find local include files # generated files seem to need this to find local include files
HOSTCFLAGS_lex.zconf.o := -I$(src) HOSTCFLAGS_lex.zconf.o := -I$(src)
...@@ -28,7 +37,10 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) ...@@ -28,7 +37,10 @@ HOSTCFLAGS_zconf.tab.o := -I$(src)
HOSTLOADLIBES_qconf = -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl HOSTLOADLIBES_qconf = -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl
HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include
$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o: $(obj)/zconf.tab.h HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
HOSTCFLAGS_gconf.o = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags`
$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h
$(obj)/qconf.o: $(obj)/.tmp_qtcheck $(obj)/qconf.o: $(obj)/.tmp_qtcheck
...@@ -38,7 +50,7 @@ MOC = $(QTDIR)/bin/moc ...@@ -38,7 +50,7 @@ MOC = $(QTDIR)/bin/moc
# QT needs some extra effort... # QT needs some extra effort...
$(obj)/.tmp_qtcheck: $(obj)/.tmp_qtcheck:
@set -e; for d in $$QTDIR /usr/share/qt /usr/lib/qt*3*; do \ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \ if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
done; \ done; \
if [ -z "$$DIR" ]; then \ if [ -z "$$DIR" ]; then \
...@@ -60,12 +72,40 @@ $(obj)/.tmp_qtcheck: ...@@ -60,12 +72,40 @@ $(obj)/.tmp_qtcheck:
fi fi
endif endif
$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
ifeq ($(MAKECMDGOALS),$(obj)/gconf)
-include $(obj)/.tmp_gtkcheck
# GTK needs some extra effort, too...
$(obj)/.tmp_gtkcheck:
@if `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --exists`; then \
if `pkg-config gtk+-2.0 --atleast-version=2.0.0`; then \
touch $@; \
else \
echo "*"; \
echo "* GTK+ is present but version >= 2.0.0 is required."; \
echo "*"; \
false; \
fi \
else \
echo "*"; \
echo "* Unable to find the GTK+ installation. Please make sure that"; \
echo "* the GTK+ 2.0 development package is correctly installed..."; \
echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \
echo "*"; \
false; \
fi
endif
$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.tab.o: $(obj)/lex.zconf.c
$(obj)/kconfig_load.o: $(obj)/lkc_defs.h $(obj)/kconfig_load.o: $(obj)/lkc_defs.h
$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h
$(obj)/gconf.o: $(obj)/lkc_defs.h
$(obj)/%.moc: $(src)/%.h $(obj)/%.moc: $(src)/%.h
$(MOC) -i $< -o $@ $(MOC) -i $< -o $@
......
This diff is collapsed.
This diff is collapsed.
...@@ -290,3 +290,37 @@ static const char *xpm_menu_inv[] = { ...@@ -290,3 +290,37 @@ static const char *xpm_menu_inv[] = {
" .......... ", " .......... ",
" .......... ", " .......... ",
" "}; " "};
static const char *xpm_menuback[] = {
"12 12 2 1",
" c white",
". c black",
" ",
" .......... ",
" . . ",
" . .. . ",
" . .... . ",
" . ...... . ",
" . ...... . ",
" . .... . ",
" . .. . ",
" . . ",
" .......... ",
" "};
static const char *xpm_void[] = {
"12 12 2 1",
" c white",
". c black",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment