2003-07-09 10:26:43

by Arjan van de Ven

[permalink] [raw]
Subject: kconf: .so linking

--- linux-2.5.74/scripts/kconfig/Makefile.org 2003-07-02 22:57:42.000000000 +0200
+++ linux-2.5.74/scripts/kconfig/Makefile 2003-07-09 12:20:49.019013406 +0200
@@ -15,7 +15,7 @@
libkconfig-objs := zconf.tab.o

host-progs := conf mconf qconf gconf
-conf-objs := conf.o libkconfig.so
+conf-objs := conf.o
mconf-objs := mconf.o libkconfig.so

ifeq ($(MAKECMDGOALS),$(obj)/qconf)
@@ -34,13 +34,15 @@
HOSTCFLAGS_lex.zconf.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src)

+HOSTLOADLIBES_conf = -Wl,-rpath,\$$ORIGIN -Lscripts/kconfig -lkconfig
+
HOSTLOADLIBES_qconf = -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl
HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include

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)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h $(obj)/libkconfig.so

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


Attachments:
kconfig.patch (1.03 kB)
signature.asc (189.00 B)
This is a digitally signed message part
Download all attachments