diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/Makefile | 24 | ||||
-rw-r--r-- | scripts/kconfig/conf.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/confdata.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/expr.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/gconf.c | 4 | ||||
-rw-r--r-- | scripts/kconfig/kconfig_load.c | 35 | ||||
-rw-r--r-- | scripts/kconfig/kxgettext.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 1 | ||||
-rw-r--r-- | scripts/kconfig/lkc.h | 5 | ||||
-rw-r--r-- | scripts/kconfig/mconf.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/menu.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/nconf.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/qconf.cc | 4 | ||||
-rw-r--r-- | scripts/kconfig/symbol.c | 1 | ||||
-rw-r--r-- | scripts/kconfig/zconf.l | 1 | ||||
-rw-r--r-- | scripts/kconfig/zconf.tab.c_shipped | 1 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 1 |
17 files changed, 9 insertions, 76 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index faa9a4701b6f..0460ac3b3588 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -170,8 +170,8 @@ mconf-objs := mconf.o zconf.tab.o $(lxdialog) | |||
170 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o | 170 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o |
171 | kxgettext-objs := kxgettext.o zconf.tab.o | 171 | kxgettext-objs := kxgettext.o zconf.tab.o |
172 | qconf-cxxobjs := qconf.o | 172 | qconf-cxxobjs := qconf.o |
173 | qconf-objs := kconfig_load.o zconf.tab.o | 173 | qconf-objs := zconf.tab.o |
174 | gconf-objs := gconf.o kconfig_load.o zconf.tab.o | 174 | gconf-objs := gconf.o zconf.tab.o |
175 | 175 | ||
176 | hostprogs-y := conf | 176 | hostprogs-y := conf |
177 | 177 | ||
@@ -203,7 +203,7 @@ ifeq ($(gconf-target),1) | |||
203 | hostprogs-y += gconf | 203 | hostprogs-y += gconf |
204 | endif | 204 | endif |
205 | 205 | ||
206 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck | 206 | clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck |
207 | clean-files += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h | 207 | clean-files += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h |
208 | clean-files += mconf qconf gconf nconf | 208 | clean-files += mconf qconf gconf nconf |
209 | clean-files += config.pot linux.pot | 209 | clean-files += config.pot linux.pot |
@@ -223,12 +223,11 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) | |||
223 | HOSTCFLAGS_lex.zconf.o := -I$(src) | 223 | HOSTCFLAGS_lex.zconf.o := -I$(src) |
224 | HOSTCFLAGS_zconf.tab.o := -I$(src) | 224 | HOSTCFLAGS_zconf.tab.o := -I$(src) |
225 | 225 | ||
226 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl | 226 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) |
227 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK | 227 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) |
228 | 228 | ||
229 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl | 229 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` |
230 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 230 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` |
231 | -D LKC_DIRECT_LINK | ||
232 | 231 | ||
233 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | 232 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) |
234 | 233 | ||
@@ -318,18 +317,11 @@ endif | |||
318 | 317 | ||
319 | $(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c | 318 | $(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c |
320 | 319 | ||
321 | $(obj)/kconfig_load.o: $(obj)/lkc_defs.h | 320 | $(obj)/qconf.o: $(obj)/qconf.moc |
322 | |||
323 | $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h | ||
324 | |||
325 | $(obj)/gconf.o: $(obj)/lkc_defs.h | ||
326 | 321 | ||
327 | $(obj)/%.moc: $(src)/%.h | 322 | $(obj)/%.moc: $(src)/%.h |
328 | $(KC_QT_MOC) -i $< -o $@ | 323 | $(KC_QT_MOC) -i $< -o $@ |
329 | 324 | ||
330 | $(obj)/lkc_defs.h: $(src)/lkc_proto.h | ||
331 | $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' | ||
332 | |||
333 | # Extract gconf menu items for I18N support | 325 | # Extract gconf menu items for I18N support |
334 | $(obj)/gconf.glade.h: $(obj)/gconf.glade | 326 | $(obj)/gconf.glade.h: $(obj)/gconf.glade |
335 | $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ | 327 | $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 6d2e936f3b67..08c05bcc82c9 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <sys/stat.h> | 14 | #include <sys/stat.h> |
15 | #include <sys/time.h> | 15 | #include <sys/time.h> |
16 | 16 | ||
17 | #define LKC_DIRECT_LINK | ||
18 | #include "lkc.h" | 17 | #include "lkc.h" |
19 | 18 | ||
20 | static void conf(struct menu *menu); | 19 | static void conf(struct menu *menu); |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index ca16ab4367dd..c257bb0bf90a 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <time.h> | 14 | #include <time.h> |
15 | #include <unistd.h> | 15 | #include <unistd.h> |
16 | 16 | ||
17 | #define LKC_DIRECT_LINK | ||
18 | #include "lkc.h" | 17 | #include "lkc.h" |
19 | 18 | ||
20 | static void conf_warning(const char *fmt, ...) | 19 | static void conf_warning(const char *fmt, ...) |
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index 001003452f68..792c62ed9d63 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <string.h> | 8 | #include <string.h> |
9 | 9 | ||
10 | #define LKC_DIRECT_LINK | ||
11 | #include "lkc.h" | 10 | #include "lkc.h" |
12 | 11 | ||
13 | #define DEBUG_EXPR 0 | 12 | #define DEBUG_EXPR 0 |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index c406bde28dbe..9258957a0913 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -1507,10 +1507,6 @@ int main(int ac, char *av[]) | |||
1507 | char *env; | 1507 | char *env; |
1508 | gchar *glade_file; | 1508 | gchar *glade_file; |
1509 | 1509 | ||
1510 | #ifndef LKC_DIRECT_LINK | ||
1511 | kconfig_load(); | ||
1512 | #endif | ||
1513 | |||
1514 | bindtextdomain(PACKAGE, LOCALEDIR); | 1510 | bindtextdomain(PACKAGE, LOCALEDIR); |
1515 | bind_textdomain_codeset(PACKAGE, "UTF-8"); | 1511 | bind_textdomain_codeset(PACKAGE, "UTF-8"); |
1516 | textdomain(PACKAGE); | 1512 | textdomain(PACKAGE); |
diff --git a/scripts/kconfig/kconfig_load.c b/scripts/kconfig/kconfig_load.c deleted file mode 100644 index dbdcaad82325..000000000000 --- a/scripts/kconfig/kconfig_load.c +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | #include <dlfcn.h> | ||
2 | #include <stdio.h> | ||
3 | #include <stdlib.h> | ||
4 | |||
5 | #include "lkc.h" | ||
6 | |||
7 | #define P(name,type,arg) type (*name ## _p) arg | ||
8 | #include "lkc_proto.h" | ||
9 | #undef P | ||
10 | |||
11 | void kconfig_load(void) | ||
12 | { | ||
13 | void *handle; | ||
14 | char *error; | ||
15 | |||
16 | handle = dlopen("./libkconfig.so", RTLD_LAZY); | ||
17 | if (!handle) { | ||
18 | handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY); | ||
19 | if (!handle) { | ||
20 | fprintf(stderr, "%s\n", dlerror()); | ||
21 | exit(1); | ||
22 | } | ||
23 | } | ||
24 | |||
25 | #define P(name,type,arg) \ | ||
26 | { \ | ||
27 | name ## _p = dlsym(handle, #name); \ | ||
28 | if ((error = dlerror())) { \ | ||
29 | fprintf(stderr, "%s\n", error); \ | ||
30 | exit(1); \ | ||
31 | } \ | ||
32 | } | ||
33 | #include "lkc_proto.h" | ||
34 | #undef P | ||
35 | } | ||
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c index e9d8e791bf0d..2858738b22d5 100644 --- a/scripts/kconfig/kxgettext.c +++ b/scripts/kconfig/kxgettext.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <string.h> | 8 | #include <string.h> |
9 | 9 | ||
10 | #define LKC_DIRECT_LINK | ||
11 | #include "lkc.h" | 10 | #include "lkc.h" |
12 | 11 | ||
13 | static char *escape(const char* text, char *bf, int len) | 12 | static char *escape(const char* text, char *bf, int len) |
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index d9182916f724..dcea7a744317 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped | |||
@@ -785,7 +785,6 @@ char *zconftext; | |||
785 | #include <string.h> | 785 | #include <string.h> |
786 | #include <unistd.h> | 786 | #include <unistd.h> |
787 | 787 | ||
788 | #define LKC_DIRECT_LINK | ||
789 | #include "lkc.h" | 788 | #include "lkc.h" |
790 | 789 | ||
791 | #define START_STRSIZE 16 | 790 | #define START_STRSIZE 16 |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index febf0c94d558..625ec69ebeee 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -21,12 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; | |||
21 | extern "C" { | 21 | extern "C" { |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | #ifdef LKC_DIRECT_LINK | ||
25 | #define P(name,type,arg) extern type name arg | 24 | #define P(name,type,arg) extern type name arg |
26 | #else | ||
27 | #include "lkc_defs.h" | ||
28 | #define P(name,type,arg) extern type (*name ## _p) arg | ||
29 | #endif | ||
30 | #include "lkc_proto.h" | 25 | #include "lkc_proto.h" |
31 | #undef P | 26 | #undef P |
32 | 27 | ||
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 87001e62cefd..820d2b6800fb 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <unistd.h> | 18 | #include <unistd.h> |
19 | #include <locale.h> | 19 | #include <locale.h> |
20 | 20 | ||
21 | #define LKC_DIRECT_LINK | ||
22 | #include "lkc.h" | 21 | #include "lkc.h" |
23 | #include "lxdialog/dialog.h" | 22 | #include "lxdialog/dialog.h" |
24 | 23 | ||
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 24547fe0fe9e..aab5a1fee5a8 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <string.h> | 9 | #include <string.h> |
10 | 10 | ||
11 | #define LKC_DIRECT_LINK | ||
12 | #include "lkc.h" | 11 | #include "lkc.h" |
13 | 12 | ||
14 | static const char nohelp_text[] = N_( | 13 | static const char nohelp_text[] = N_( |
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 488dd7410787..da9f5c49d886 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | #define _GNU_SOURCE | 8 | #define _GNU_SOURCE |
9 | #include <string.h> | 9 | #include <string.h> |
10 | #define LKC_DIRECT_LINK | 10 | |
11 | #include "lkc.h" | 11 | #include "lkc.h" |
12 | #include "nconf.h" | 12 | #include "nconf.h" |
13 | #include <ctype.h> | 13 | #include <ctype.h> |
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index c2796b866f8f..31e01cdbfc6e 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1745,10 +1745,6 @@ int main(int ac, char** av) | |||
1745 | bindtextdomain(PACKAGE, LOCALEDIR); | 1745 | bindtextdomain(PACKAGE, LOCALEDIR); |
1746 | textdomain(PACKAGE); | 1746 | textdomain(PACKAGE); |
1747 | 1747 | ||
1748 | #ifndef LKC_DIRECT_LINK | ||
1749 | kconfig_load(); | ||
1750 | #endif | ||
1751 | |||
1752 | progname = av[0]; | 1748 | progname = av[0]; |
1753 | configApp = new QApplication(ac, av); | 1749 | configApp = new QApplication(ac, av); |
1754 | if (ac > 1 && av[1][0] == '-') { | 1750 | if (ac > 1 && av[1][0] == '-') { |
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index a796c95fe8a0..cf8edf4fc429 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <regex.h> | 9 | #include <regex.h> |
10 | #include <sys/utsname.h> | 10 | #include <sys/utsname.h> |
11 | 11 | ||
12 | #define LKC_DIRECT_LINK | ||
13 | #include "lkc.h" | 12 | #include "lkc.h" |
14 | 13 | ||
15 | struct symbol symbol_yes = { | 14 | struct symbol symbol_yes = { |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index b22f884f9022..29b79f4c34c2 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <string.h> | 14 | #include <string.h> |
15 | #include <unistd.h> | 15 | #include <unistd.h> |
16 | 16 | ||
17 | #define LKC_DIRECT_LINK | ||
18 | #include "lkc.h" | 17 | #include "lkc.h" |
19 | 18 | ||
20 | #define START_STRSIZE 16 | 19 | #define START_STRSIZE 16 |
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index 4c5495ea205e..c1579e6e79a6 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped | |||
@@ -88,7 +88,6 @@ | |||
88 | #include <string.h> | 88 | #include <string.h> |
89 | #include <stdbool.h> | 89 | #include <stdbool.h> |
90 | 90 | ||
91 | #define LKC_DIRECT_LINK | ||
92 | #include "lkc.h" | 91 | #include "lkc.h" |
93 | 92 | ||
94 | #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) | 93 | #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 49fb4ab664c3..29c391f51606 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <string.h> | 11 | #include <string.h> |
12 | #include <stdbool.h> | 12 | #include <stdbool.h> |
13 | 13 | ||
14 | #define LKC_DIRECT_LINK | ||
15 | #include "lkc.h" | 14 | #include "lkc.h" |
16 | 15 | ||
17 | #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) | 16 | #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) |