diff options
Diffstat (limited to 'misc/tools/kconfig-frontends')
20 files changed, 79 insertions, 79 deletions
diff --git a/misc/tools/kconfig-frontends/Makefile.in b/misc/tools/kconfig-frontends/Makefile.in index 0d1e6f93d..d1ac32ce7 100644 --- a/misc/tools/kconfig-frontends/Makefile.in +++ b/misc/tools/kconfig-frontends/Makefile.in @@ -358,7 +358,7 @@ scripts/.autostuff/config.h: scripts/.autostuff/stamp-h1 scripts/.autostuff/stamp-h1: $(top_srcdir)/scripts/.autostuff/config.h.in $(top_builddir)/config.status @rm -f scripts/.autostuff/stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status scripts/.autostuff/config.h -$(top_srcdir)/scripts/.autostuff/config.h.in: $(am__configure_deps) +$(top_srcdir)/scripts/.autostuff/config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f scripts/.autostuff/stamp-h1 touch $@ diff --git a/misc/tools/kconfig-frontends/aclocal.m4 b/misc/tools/kconfig-frontends/aclocal.m4 index 94136cef4..815633438 100644 --- a/misc/tools/kconfig-frontends/aclocal.m4 +++ b/misc/tools/kconfig-frontends/aclocal.m4 @@ -22,7 +22,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) -# +# # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # # This program is free software; you can redistribute it and/or modify @@ -145,7 +145,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs diff --git a/misc/tools/kconfig-frontends/docs/kconfig-language.txt b/misc/tools/kconfig-frontends/docs/kconfig-language.txt index c420676c6..8174b4ed2 100644 --- a/misc/tools/kconfig-frontends/docs/kconfig-language.txt +++ b/misc/tools/kconfig-frontends/docs/kconfig-language.txt @@ -173,7 +173,7 @@ module state. Dependency expressions have the following syntax: <expr> '&&' <expr> (6) <expr> '||' <expr> (7) -Expressions are listed in decreasing order of precedence. +Expressions are listed in decreasing order of precedence. (1) Convert the symbol into an expression. Boolean and tristate symbols are simply converted into the respective expression values. All diff --git a/misc/tools/kconfig-frontends/frontends/conf/Makefile.in b/misc/tools/kconfig-frontends/frontends/conf/Makefile.in index 9e8ee4c66..caaa7b329 100644 --- a/misc/tools/kconfig-frontends/frontends/conf/Makefile.in +++ b/misc/tools/kconfig-frontends/frontends/conf/Makefile.in @@ -368,7 +368,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -conf$(EXEEXT): $(conf_OBJECTS) $(conf_DEPENDENCIES) $(EXTRA_conf_DEPENDENCIES) +conf$(EXEEXT): $(conf_OBJECTS) $(conf_DEPENDENCIES) $(EXTRA_conf_DEPENDENCIES) @rm -f conf$(EXEEXT) $(AM_V_CCLD)$(conf_LINK) $(conf_OBJECTS) $(conf_LDADD) $(LIBS) diff --git a/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in index b491ef5d4..1e7362b06 100644 --- a/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in +++ b/misc/tools/kconfig-frontends/frontends/gconf/Makefile.in @@ -407,7 +407,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -gconf$(EXEEXT): $(gconf_OBJECTS) $(gconf_DEPENDENCIES) $(EXTRA_gconf_DEPENDENCIES) +gconf$(EXEEXT): $(gconf_OBJECTS) $(gconf_DEPENDENCIES) $(EXTRA_gconf_DEPENDENCIES) @rm -f gconf$(EXEEXT) $(AM_V_CCLD)$(gconf_LINK) $(gconf_OBJECTS) $(gconf_LDADD) $(LIBS) diff --git a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch index 4b55ff7b8..d43076161 100644 --- a/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch +++ b/misc/tools/kconfig-frontends/frontends/gconf/gconf.c.patch @@ -2,12 +2,12 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c --- a/frontends/gconf/gconf.c +++ b/frontends/gconf/gconf.c @@ -12,7 +12,7 @@ - + #include <stdlib.h> #include "lkc.h" -#include "images.c" +#include "images.h" - + #include <glade/glade.h> #include <gtk/gtk.h> @@ -1468,8 +1468,10 @@ @@ -19,13 +19,13 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c +#endif - gchar *glade_file; + gchar *glade_file = GUI_PATH; - + bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); @@ -1483,6 +1485,7 @@ //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); - + +#if 0 /* Determine GUI path */ env = getenv(SRCTREE); @@ -35,6 +35,6 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c else glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); +#endif - + /* Conf stuffs */ if (ac > 1 && av[1][0] == '-') { diff --git a/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in index 0b684e88e..ba59b7df9 100644 --- a/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in +++ b/misc/tools/kconfig-frontends/frontends/mconf/Makefile.in @@ -374,7 +374,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -mconf$(EXEEXT): $(mconf_OBJECTS) $(mconf_DEPENDENCIES) $(EXTRA_mconf_DEPENDENCIES) +mconf$(EXEEXT): $(mconf_OBJECTS) $(mconf_DEPENDENCIES) $(EXTRA_mconf_DEPENDENCIES) @rm -f mconf$(EXEEXT) $(AM_V_CCLD)$(mconf_LINK) $(mconf_OBJECTS) $(mconf_LDADD) $(LIBS) diff --git a/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in index 82540d27b..b9f9d682f 100644 --- a/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in +++ b/misc/tools/kconfig-frontends/frontends/nconf/Makefile.in @@ -372,7 +372,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -nconf$(EXEEXT): $(nconf_OBJECTS) $(nconf_DEPENDENCIES) $(EXTRA_nconf_DEPENDENCIES) +nconf$(EXEEXT): $(nconf_OBJECTS) $(nconf_DEPENDENCIES) $(EXTRA_nconf_DEPENDENCIES) @rm -f nconf$(EXEEXT) $(AM_V_CCLD)$(nconf_LINK) $(nconf_OBJECTS) $(nconf_LDADD) $(LIBS) diff --git a/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in b/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in index a999f51a2..bb95195e3 100644 --- a/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in +++ b/misc/tools/kconfig-frontends/frontends/qconf/Makefile.in @@ -397,7 +397,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -qconf$(EXEEXT): $(qconf_OBJECTS) $(qconf_DEPENDENCIES) $(EXTRA_qconf_DEPENDENCIES) +qconf$(EXEEXT): $(qconf_OBJECTS) $(qconf_DEPENDENCIES) $(EXTRA_qconf_DEPENDENCIES) @rm -f qconf$(EXEEXT) $(AM_V_CXXLD)$(qconf_LINK) $(qconf_OBJECTS) $(qconf_LDADD) $(LIBS) diff --git a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch index 6769d750c..a8a78bb55 100644 --- a/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch +++ b/misc/tools/kconfig-frontends/frontends/qconf/qconf.cc.patch @@ -3,10 +3,10 @@ diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc +++ b/frontends/qconf/qconf.cc @@ -47,7 +47,7 @@ #include "qconf.h" - + #include "qconf.moc" -#include "images.c" +#include "images.h" - + #ifdef _ # undef _ diff --git a/misc/tools/kconfig-frontends/libs/images/Makefile.in b/misc/tools/kconfig-frontends/libs/images/Makefile.in index 6535424b2..2a748cda3 100644 --- a/misc/tools/kconfig-frontends/libs/images/Makefile.in +++ b/misc/tools/kconfig-frontends/libs/images/Makefile.in @@ -322,7 +322,7 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libkconfig-images.a: $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_DEPENDENCIES) $(EXTRA_libkconfig_images_a_DEPENDENCIES) +libkconfig-images.a: $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_DEPENDENCIES) $(EXTRA_libkconfig_images_a_DEPENDENCIES) $(AM_V_at)-rm -f libkconfig-images.a $(AM_V_AR)$(libkconfig_images_a_AR) libkconfig-images.a $(libkconfig_images_a_OBJECTS) $(libkconfig_images_a_LIBADD) $(AM_V_at)$(RANLIB) libkconfig-images.a diff --git a/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in b/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in index 0a07c7c90..86630bab3 100644 --- a/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in +++ b/misc/tools/kconfig-frontends/libs/lxdialog/Makefile.in @@ -334,7 +334,7 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libkconfig-lxdialog.a: $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_DEPENDENCIES) $(EXTRA_libkconfig_lxdialog_a_DEPENDENCIES) +libkconfig-lxdialog.a: $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_DEPENDENCIES) $(EXTRA_libkconfig_lxdialog_a_DEPENDENCIES) $(AM_V_at)-rm -f libkconfig-lxdialog.a $(AM_V_AR)$(libkconfig_lxdialog_a_AR) libkconfig-lxdialog.a $(libkconfig_lxdialog_a_OBJECTS) $(libkconfig_lxdialog_a_LIBADD) $(AM_V_at)$(RANLIB) libkconfig-lxdialog.a diff --git a/misc/tools/kconfig-frontends/libs/parser/Makefile.in b/misc/tools/kconfig-frontends/libs/parser/Makefile.in index d575f4e55..831feb460 100644 --- a/misc/tools/kconfig-frontends/libs/parser/Makefile.in +++ b/misc/tools/kconfig-frontends/libs/parser/Makefile.in @@ -413,7 +413,7 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libkconfig-parser.la: $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_DEPENDENCIES) $(EXTRA_libkconfig_parser_la_DEPENDENCIES) +libkconfig-parser.la: $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_DEPENDENCIES) $(EXTRA_libkconfig_parser_la_DEPENDENCIES) $(AM_V_CCLD)$(libkconfig_parser_la_LINK) -rpath $(libdir) $(libkconfig_parser_la_OBJECTS) $(libkconfig_parser_la_LIBADD) $(LIBS) mostlyclean-compile: diff --git a/misc/tools/kconfig-frontends/libs/parser/lconf.c b/misc/tools/kconfig-frontends/libs/parser/lconf.c index 24aa3491c..aef090fb1 100644 --- a/misc/tools/kconfig-frontends/libs/parser/lconf.c +++ b/misc/tools/kconfig-frontends/libs/parser/lconf.c @@ -52,7 +52,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -189,7 +189,7 @@ extern FILE *zconfin, *zconfout; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -251,7 +251,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -900,7 +900,7 @@ extern int zconfwrap (void ); #endif static void yyunput (int c,char *buf_ptr ); - + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -1010,7 +1010,7 @@ YY_DECL register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + int str = 0; int ts, i; @@ -1621,7 +1621,7 @@ static int yy_get_next_buffer (void) { register yy_state_type yy_current_state; register char *yy_cp; - + yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) @@ -1640,7 +1640,7 @@ static int yy_get_next_buffer (void) static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { register int yy_is_jam; - + yy_current_state = yy_nxt[yy_current_state][1]; yy_is_jam = (yy_current_state <= 0); @@ -1650,7 +1650,7 @@ static int yy_get_next_buffer (void) static void yyunput (int c, register char * yy_bp ) { register char *yy_cp; - + yy_cp = (yy_c_buf_p); /* undo effects of setting up zconftext */ @@ -1693,7 +1693,7 @@ static int yy_get_next_buffer (void) { int c; - + *(yy_c_buf_p) = (yy_hold_char); if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) @@ -1760,12 +1760,12 @@ static int yy_get_next_buffer (void) /** Immediately switch to a different input stream. * @param input_file A readable stream. - * + * * @note This function does not reset the start condition to @c INITIAL . */ void zconfrestart (FILE * input_file ) { - + if ( ! YY_CURRENT_BUFFER ){ zconfensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1778,11 +1778,11 @@ static int yy_get_next_buffer (void) /** Switch to a different input buffer. * @param new_buffer The new input buffer. - * + * */ void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - + /* TODO. We should be able to replace this entire function body * with * zconfpop_buffer_state(); @@ -1822,13 +1822,13 @@ static void zconf_load_buffer_state (void) /** Allocate and initialize an input buffer state. * @param file A readable stream. * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * + * * @return the allocated buffer state. */ YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size ) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); @@ -1851,11 +1851,11 @@ static void zconf_load_buffer_state (void) /** Destroy the buffer. * @param b a buffer created with zconf_create_buffer() - * + * */ void zconf_delete_buffer (YY_BUFFER_STATE b ) { - + if ( ! b ) return; @@ -1876,7 +1876,7 @@ static void zconf_load_buffer_state (void) { int oerrno = errno; - + zconf_flush_buffer(b ); b->yy_input_file = file; @@ -1892,13 +1892,13 @@ static void zconf_load_buffer_state (void) } b->yy_is_interactive = 0; - + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * + * */ void zconf_flush_buffer (YY_BUFFER_STATE b ) { @@ -1927,7 +1927,7 @@ static void zconf_load_buffer_state (void) * the current state. This function will allocate the stack * if necessary. * @param new_buffer The new state. - * + * */ void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) { @@ -1957,7 +1957,7 @@ void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. - * + * */ void zconfpop_buffer_state (void) { @@ -1981,7 +1981,7 @@ void zconfpop_buffer_state (void) static void zconfensure_buffer_stack (void) { int num_to_alloc; - + if (!(yy_buffer_stack)) { /* First allocation is just for 2 elements, since we don't know if this @@ -1994,9 +1994,9 @@ static void zconfensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2024,13 +2024,13 @@ static void zconfensure_buffer_stack (void) /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. + * + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -2059,14 +2059,14 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to zconflex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan - * + * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * zconf_scan_bytes() instead. */ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr ) { - + return zconf_scan_bytes(yystr,strlen(yystr) ); } @@ -2074,7 +2074,7 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr ) * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * + * * @return the newly allocated buffer state object. */ YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, int _yybytes_len ) @@ -2083,7 +2083,7 @@ YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, int _yybytes_len ) char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) zconfalloc(n ); @@ -2137,16 +2137,16 @@ static void yy_fatal_error (yyconst char* msg ) /* Accessor methods (get/set functions) to struct members. */ /** Get the current line number. - * + * */ int zconfget_lineno (void) { - + return zconflineno; } /** Get the input stream. - * + * */ FILE *zconfget_in (void) { @@ -2154,7 +2154,7 @@ FILE *zconfget_in (void) } /** Get the output stream. - * + * */ FILE *zconfget_out (void) { @@ -2162,7 +2162,7 @@ FILE *zconfget_out (void) } /** Get the length of the current token. - * + * */ int zconfget_leng (void) { @@ -2170,7 +2170,7 @@ int zconfget_leng (void) } /** Get the current token. - * + * */ char *zconfget_text (void) @@ -2180,18 +2180,18 @@ char *zconfget_text (void) /** Set the current line number. * @param line_number - * + * */ void zconfset_lineno (int line_number ) { - + zconflineno = line_number; } /** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. - * + * * @see zconf_switch_to_buffer */ void zconfset_in (FILE * in_str ) @@ -2245,7 +2245,7 @@ static int yy_init_globals (void) /* zconflex_destroy is for both reentrant and non-reentrant scanners. */ int zconflex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ zconf_delete_buffer(YY_CURRENT_BUFFER ); diff --git a/misc/tools/kconfig-frontends/libs/parser/yconf.c b/misc/tools/kconfig-frontends/libs/parser/yconf.c index 817829aef..6b6efcab2 100644 --- a/misc/tools/kconfig-frontends/libs/parser/yconf.c +++ b/misc/tools/kconfig-frontends/libs/parser/yconf.c @@ -1,19 +1,19 @@ /* A Bison parser, made by GNU Bison 2.5. */ /* Bison implementation for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch index 6856904ce..09b9bbf55 100644 --- a/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch +++ b/misc/tools/kconfig-frontends/libs/parser/yconf.y.patch @@ -1,27 +1,27 @@ --- a/libs/parser/yconf.y 2012-01-12 22:37:17.582339777 +0100 +++ b/libs/parser/yconf.y 2012-03-03 23:55:29.889737630 +0100 @@ -96,7 +96,7 @@ - + %{ /* Include zconf.hash.c here so it can see the token constants. */ -#include "zconf.hash.c" +#include "hconf.c" %} - + %% @@ -493,7 +493,7 @@ - + sym_init(); _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, ROOTMENU, NULL); - + if (getenv("ZCONF_DEBUG")) zconfdebug = 1; @@ -725,7 +725,7 @@ } } - + -#include "zconf.lex.c" +#include "lconf.c" #include "util.c" diff --git a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4 b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4 index 02b4bbec5..2da2dc98d 100644 --- a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4 +++ b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/libtool.m4 @@ -1196,7 +1196,7 @@ fi # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } case "$ECHO" in diff --git a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4 b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4 index c573da90c..ffeab5680 100644 --- a/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4 +++ b/misc/tools/kconfig-frontends/scripts/.autostuff/m4/lt~obsolete.m4 @@ -25,7 +25,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff --git a/misc/tools/kconfig-frontends/utils/Makefile.in b/misc/tools/kconfig-frontends/utils/Makefile.in index 06e1026a1..fe3c93a72 100644 --- a/misc/tools/kconfig-frontends/utils/Makefile.in +++ b/misc/tools/kconfig-frontends/utils/Makefile.in @@ -404,7 +404,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) $(EXTRA_gettext_DEPENDENCIES) +gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) $(EXTRA_gettext_DEPENDENCIES) @rm -f gettext$(EXEEXT) $(AM_V_CCLD)$(gettext_LINK) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) diff --git a/misc/tools/kconfig-frontends/utils/tweak.in.patch b/misc/tools/kconfig-frontends/utils/tweak.in.patch index c4b855790..0fc79e1a9 100644 --- a/misc/tools/kconfig-frontends/utils/tweak.in.patch +++ b/misc/tools/kconfig-frontends/utils/tweak.in.patch @@ -2,20 +2,20 @@ diff --git a/utils/tweak.in b/utils/tweak.in --- a/utils/tweak.in +++ b/utils/tweak.in @@ -3,8 +3,8 @@ - + myname=${0##*/} - + -# If no prefix forced, use the default CONFIG_ -CONFIG_="${CONFIG_-CONFIG_}" +# If no prefix forced, use the default @CONFIG_@ +CONFIG_="${CONFIG_-@CONFIG_@}" - + usage() { cat >&2 <<EOL @@ -41,7 +41,7 @@ By default, $myname will upper-case the given symbol. Use --keep-case to keep the case of all following symbols unchanged. - + -$myname uses 'CONFIG_' as the default symbol prefix. Set the environment +$myname uses '@CONFIG_@' as the default symbol prefix. Set the environment variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ... |