Commit 5a6f8d2b authored by Arnaud Lacombe's avatar Arnaud Lacombe
Browse files

kconfig: nuke LKC_DIRECT_LINK cruft 



This interface is not (and has never been ?) used by any frontend, just get rid
of it.

Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
parent 84250386

scripts/kconfig/Makefile

+8 −16
Original line number Diff line number Diff line
@@ -170,8 +170,8 @@ mconf-objs := mconf.o zconf.tab.o $(lxdialog) 
nconf-objs     := nconf.o zconf.tab.o nconf.gui.o

kxgettext-objs	:= kxgettext.o zconf.tab.o

qconf-cxxobjs	:= qconf.o

qconf-objs	:= kconfig_load.o zconf.tab.o

gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o

qconf-objs	:= zconf.tab.o

gconf-objs	:= gconf.o zconf.tab.o



hostprogs-y := conf
@@ -203,7 +203,7 @@ ifeq ($(gconf-target),1) 
	hostprogs-y += gconf

endif



clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck

clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck

clean-files	+= zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h

clean-files     += mconf qconf gconf nconf

clean-files     += config.pot linux.pot
@@ -223,12 +223,11 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) 
HOSTCFLAGS_lex.zconf.o	:= -I$(src)

HOSTCFLAGS_zconf.tab.o	:= -I$(src)



HOSTLOADLIBES_qconf	= $(KC_QT_LIBS) -ldl

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK

HOSTLOADLIBES_qconf	= $(KC_QT_LIBS)

HOSTCXXFLAGS_qconf.o	= $(KC_QT_CFLAGS)



HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl

HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

                          -D LKC_DIRECT_LINK

HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`

HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0`



HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
@@ -318,18 +317,11 @@ endif 


$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c



$(obj)/kconfig_load.o: $(obj)/lkc_defs.h



$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h



$(obj)/gconf.o: $(obj)/lkc_defs.h

$(obj)/qconf.o: $(obj)/qconf.moc



$(obj)/%.moc: $(src)/%.h

	$(KC_QT_MOC) -i $< -o $@



$(obj)/lkc_defs.h: $(src)/lkc_proto.h

	$(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'



# Extract gconf menu items for I18N support

$(obj)/gconf.glade.h: $(obj)/gconf.glade

	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \

scripts/kconfig/conf.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <sys/stat.h>

#include <sys/time.h>



#define LKC_DIRECT_LINK

#include "lkc.h"



static void conf(struct menu *menu);

scripts/kconfig/confdata.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <time.h>

#include <unistd.h>



#define LKC_DIRECT_LINK

#include "lkc.h"



static void conf_warning(const char *fmt, ...)

scripts/kconfig/expr.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <stdlib.h>

#include <string.h>



#define LKC_DIRECT_LINK

#include "lkc.h"



#define DEBUG_EXPR	0

scripts/kconfig/gconf.c

+0 −4
Original line number Diff line number Diff line
@@ -1507,10 +1507,6 @@ int main(int ac, char *av[]) 
	char *env;

	gchar *glade_file;



#ifndef LKC_DIRECT_LINK

	kconfig_load();

#endif



	bindtextdomain(PACKAGE, LOCALEDIR);

	bind_textdomain_codeset(PACKAGE, "UTF-8");

	textdomain(PACKAGE);