libs/images: make it a proper library

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.hgignore b/.hgignore
index 476e1dcb13fdb388f25f0814b1c7d243458a7fd4..0c643974d26ad81e90f2b5cd47a005071217eab1 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -14,6 +14,8 @@ frontends/nconf/nconf
 frontends/qconf/qconf
 frontends/qconf/qconf.moc
 
+libs/images/images.c
+libs/images/images.h
 libs/parser/?conf.c
 libs/*/.libs
 frontends/*/.libs

diff --git a/configure.ac b/configure.ac
index b342ff18b892ec142dfbeb2bae6c386477b0a4a3..7f095b41268d46db24730199da190c579c1b1acb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,13 @@ AS_IF(
     [need_lxdialog=yes],
     [need_lxdialog=no])
 
+#----------------------------------------
+# Check if the images library should be built
+AS_IF(
+    [test "$enable_gconf" = "yes" -o "$enable_qconf" = "yes"],
+    [need_images=yes],
+    [need_images=no])
+
 #----------------------------------------
 # Setup automake conditional build
 AM_CONDITIONAL(
@@ -375,6 +382,9 @@ AM_CONDITIONAL(
 AM_CONDITIONAL(
     [COND_lxdialog],
     [test "$need_lxdialog" = "yes"])
+AM_CONDITIONAL(
+    [COND_images],
+    [test "$need_images" = "yes"])
 
 #----------------------------------------
 # Get the version to apply to the parser shared library

diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am
index ff70aadb9453d6ceecd9c5a7f6a667054be02ad8..e02b40d4172bede3368312f888c282bdd41fede2 100644 (file)
--- a/frontends/gconf/Makefile.am
+++ b/frontends/gconf/Makefile.am
@@ -4,12 +4,13 @@ gconf_SOURCES = gconf.c gconf.glade
 gconf_CPPFLAGS = $(AM_CPPFLAGS)         \
                  $(GETTEXT)             \
                  -I$(top_srcdir)/libs/parser    \
-                 -I$(top_srcdir)/libs/images    \
+                 -I$(top_builddir)/libs/images  \
                  -DGUI_PATH='"$(pkgdatadir)/gconf.glade"'
 gconf_CFLAGS = $(AM_CFLAGS) \
                $(kf_CFLAGS) \
                $(gtk_CFLAGS)
 gconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
+              $(top_builddir)/libs/images/libimages.a         \
               $(gtk_LIBS) $(gconf_EXTRA_LIBS)
 gconfdir = $(pkgdatadir)
 gconf_DATA = gconf.glade

diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
index 14da73a492bfab22bff45208418636c2dbdc40fb..b73a4f14a082e7add5f317de8b35500a50fc3f84 100644 (file)
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -11,11 +11,6 @@
 #endif
 
 #include "lkc.h"
-#define WANTS_xpm_single_view
-#define WANTS_xpm_split_view
-#define WANTS_xpm_tree_view
-#define WANTS_xpm_menu
-#define WANTS_xpm_void
 #include "images.h"
 
 #include <glade/glade.h>

diff --git a/frontends/gconf/gconf.c.patch b/frontends/gconf/gconf.c.patch
index 7ce758623f180d35663b10321dd93a528ed5f081..fbd898010d6468fd3b9ac0cbf5aca9ce5242df7e 100644 (file)
--- a/frontends/gconf/gconf.c.patch
+++ b/frontends/gconf/gconf.c.patch
@@ -1,21 +1,16 @@
 diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
 --- a/frontends/gconf/gconf.c
 +++ b/frontends/gconf/gconf.c
-@@ -11,7 +11,12 @@
+@@ -11,7 +11,7 @@
  #endif
  
  #include "lkc.h"
 -#include "images.c"
-+#define WANTS_xpm_single_view
-+#define WANTS_xpm_split_view
-+#define WANTS_xpm_tree_view
-+#define WANTS_xpm_menu
-+#define WANTS_xpm_void
 +#include "images.h"
  
  #include <glade/glade.h>
  #include <gtk/gtk.h>
-@@ -1468,8 +1473,10 @@
+@@ -1468,8 +1468,10 @@
  int main(int ac, char *av[])
  {
        const char *name;
@@ -27,7 +22,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
  
        bindtextdomain(PACKAGE, LOCALEDIR);
        bind_textdomain_codeset(PACKAGE, "UTF-8");
-@@ -1483,6 +1490,7 @@
+@@ -1483,6 +1485,7 @@
        //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
        //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
  
@@ -35,7 +30,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
        /* Determine GUI path */
        env = getenv(SRCTREE);
        if (env)
-@@ -1491,6 +1499,7 @@
+@@ -1491,6 +1494,7 @@
                glade_file = g_strconcat(av[0], ".glade", NULL);
        else
                glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);

diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am
index b0ba091fed8d653b954e52fb0722638b55200ced..361ec622f105c25e6806c16cdefcfe387363942c 100644 (file)
--- a/frontends/qconf/Makefile.am
+++ b/frontends/qconf/Makefile.am
@@ -5,11 +5,12 @@ BUILT_SOURCES = qconf.moc
 qconf_CPPFLAGS = $(AM_CPPFLAGS)         \
                  $(GETTEXT)             \
                  -I$(top_srcdir)/libs/parser    \
-                 -I$(top_srcdir)/libs/images
+                 -I$(top_builddir)/libs/images
 qconf_CXXFLAGS = $(AM_CXXFLAGS) \
                  $(kf_CFLAGS)   \
                  $(qt4_CFLAGS)
 qconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
+              $(top_builddir)/libs/images/libimages.a         \
               $(qt4_LIBS) $(qconf_EXTRA_LIBS)
 
 .h.moc:

diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
index d8d61ba9cb775ba880afdf7cce23dd30ca86425f..1b2b0864b587952dc1728db6f4f41cdb1977ae61 100644 (file)
--- a/frontends/qconf/qconf.cc
+++ b/frontends/qconf/qconf.cc
@@ -46,21 +46,6 @@
 #include "qconf.h"
 
 #include "qconf.moc"
-#define WANTS_xpm_symbol_yes
-#define WANTS_xpm_symbol_mod
-#define WANTS_xpm_symbol_no
-#define WANTS_xpm_choice_yes
-#define WANTS_xpm_choice_no
-#define WANTS_xpm_menu
-#define WANTS_xpm_menu_inv
-#define WANTS_xpm_menuback
-#define WANTS_xpm_void
-#define WANTS_xpm_back
-#define WANTS_xpm_load
-#define WANTS_xpm_save
-#define WANTS_xpm_single_view
-#define WANTS_xpm_split_view
-#define WANTS_xpm_tree_view
 #include "images.h"
 
 #ifdef _

diff --git a/frontends/qconf/qconf.cc.patch b/frontends/qconf/qconf.cc.patch
index 54045a04ccfc46237562aaa3bb5dadd0aa17845d..fb7a1292a3c5e26bc91276a35a68735abc660de6 100644 (file)
--- a/frontends/qconf/qconf.cc.patch
+++ b/frontends/qconf/qconf.cc.patch
@@ -1,26 +1,11 @@
 diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
 --- a/frontends/qconf/qconf.cc
 +++ b/frontends/qconf/qconf.cc
-@@ -46,7 +46,22 @@
+@@ -46,7 +46,7 @@
  #include "qconf.h"
  
  #include "qconf.moc"
 -#include "images.c"
-+#define WANTS_xpm_symbol_yes
-+#define WANTS_xpm_symbol_mod
-+#define WANTS_xpm_symbol_no
-+#define WANTS_xpm_choice_yes
-+#define WANTS_xpm_choice_no
-+#define WANTS_xpm_menu
-+#define WANTS_xpm_menu_inv
-+#define WANTS_xpm_menuback
-+#define WANTS_xpm_void
-+#define WANTS_xpm_back
-+#define WANTS_xpm_load
-+#define WANTS_xpm_save
-+#define WANTS_xpm_single_view
-+#define WANTS_xpm_split_view
-+#define WANTS_xpm_tree_view
 +#include "images.h"
  
  #ifdef _

diff --git a/libs/Makefile.am b/libs/Makefile.am
index 5069f5d8f0522d09a13fe462b685c7be004e5da9..d4c5973837185f0920594f3240cc585cc2027923 100644 (file)
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,4 +1,7 @@
 if COND_lxdialog
     MAYBE_lxdialog = lxdialog
 endif
-SUBDIRS = parser images $(MAYBE_lxdialog)
+if COND_images
+    MAYBE_images = images
+endif
+SUBDIRS = parser $(MAYBE_images) $(MAYBE_lxdialog)

diff --git a/libs/images/Makefile.am b/libs/images/Makefile.am
index d9c4123d00c91cf88bb90f79dc7bde7fae40d1a2..ae99e1912a948d6464f54ccaed822a1602a75106 100644 (file)
--- a/libs/images/Makefile.am
+++ b/libs/images/Makefile.am
@@ -1 +1,13 @@
-EXTRA_DIST = images.h
+noinst_LIBRARIES = libimages.a
+
+libimages_a_SOURCES = images.c_orig
+nodist_libimages_a_SOURCES = images.c
+BUILT_SOURCES = images.c images.h
+CLEANFILES = images.c images.h
+
+images.c: images.c_orig
+       $(SED) -r -e 's/^static //' $< >$@
+
+images.h: images.c_orig
+       $(SED) -r -e '/^static (const char \*xpm_(.+)\[\]) = \{/!d; s//extern \1;/' \
+              $< >$@

diff --git a/libs/images/images.c_orig b/libs/images/images.c_orig
new file mode 100644 (file)
index 0000000..d4f84bd
--- /dev/null
+++ b/libs/images/images.c_orig
@@ -0,0 +1,326 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+static const char *xpm_load[] = {
+"22 22 5 1",
+". c None",
+"# c #000000",
+"c c #838100",
+"a c #ffff00",
+"b c #ffffff",
+"......................",
+"......................",
+"......................",
+"............####....#.",
+"...........#....##.##.",
+"..................###.",
+".................####.",
+".####...........#####.",
+"#abab##########.......",
+"#babababababab#.......",
+"#ababababababa#.......",
+"#babababababab#.......",
+"#ababab###############",
+"#babab##cccccccccccc##",
+"#abab##cccccccccccc##.",
+"#bab##cccccccccccc##..",
+"#ab##cccccccccccc##...",
+"#b##cccccccccccc##....",
+"###cccccccccccc##.....",
+"##cccccccccccc##......",
+"###############.......",
+"......................"};
+
+static const char *xpm_save[] = {
+"22 22 5 1",
+". c None",
+"# c #000000",
+"a c #838100",
+"b c #c5c2c5",
+"c c #cdb6d5",
+"......................",
+".####################.",
+".#aa#bbbbbbbbbbbb#bb#.",
+".#aa#bbbbbbbbbbbb#bb#.",
+".#aa#bbbbbbbbbcbb####.",
+".#aa#bbbccbbbbbbb#aa#.",
+".#aa#bbbccbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aaa############aaa#.",
+".#aaaaaaaaaaaaaaaaaa#.",
+".#aaaaaaaaaaaaaaaaaa#.",
+".#aaa#############aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+"..##################..",
+"......................"};
+
+static const char *xpm_back[] = {
+"22 22 3 1",
+". c None",
+"# c #000083",
+"a c #838183",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"...........######a....",
+"..#......##########...",
+"..##...####......##a..",
+"..###.###.........##..",
+"..######..........##..",
+"..#####...........##..",
+"..######..........##..",
+"..#######.........##..",
+"..########.......##a..",
+"...............a###...",
+"...............###....",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
+static const char *xpm_tree_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......................",
+"......................"};
+
+static const char *xpm_single_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"......................",
+"......................"};
+
+static const char *xpm_split_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......................",
+"......................"};
+
+static const char *xpm_symbol_no[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_symbol_mod[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .   ..   . ",
+" .  ....  . ",
+" .  ....  . ",
+" .   ..   . ",
+" .        . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_symbol_yes[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .      . . ",
+" .     .. . ",
+" . .  ..  . ",
+" . ....   . ",
+" .  ..    . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_choice_no[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+"    ....    ",
+"  ..    ..  ",
+"  .      .  ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+"  .      .  ",
+"  ..    ..  ",
+"    ....    ",
+"            "};
+
+static const char *xpm_choice_yes[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+"    ....    ",
+"  ..    ..  ",
+"  .      .  ",
+" .   ..   . ",
+" .  ....  . ",
+" .  ....  . ",
+" .   ..   . ",
+"  .      .  ",
+"  ..    ..  ",
+"    ....    ",
+"            "};
+
+static const char *xpm_menu[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" . ..     . ",
+" . ....   . ",
+" . ...... . ",
+" . ...... . ",
+" . ....   . ",
+" . ..     . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_menu_inv[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .......... ",
+" ..  ...... ",
+" ..    .... ",
+" ..      .. ",
+" ..      .. ",
+" ..    .... ",
+" ..  ...... ",
+" .......... ",
+" .......... ",
+"            "};
+
+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",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            "};

diff --git a/libs/images/images.h b/libs/images/images.h
deleted file mode 100644 (file)
index 08fdf8a..0000000
--- a/libs/images/images.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
- */
-
-#ifdef WANTS_xpm_load
-static const char *xpm_load[] = {
-"22 22 5 1",
-". c None",
-"# c #000000",
-"c c #838100",
-"a c #ffff00",
-"b c #ffffff",
-"......................",
-"......................",
-"......................",
-"............####....#.",
-"...........#....##.##.",
-"..................###.",
-".................####.",
-".####...........#####.",
-"#abab##########.......",
-"#babababababab#.......",
-"#ababababababa#.......",
-"#babababababab#.......",
-"#ababab###############",
-"#babab##cccccccccccc##",
-"#abab##cccccccccccc##.",
-"#bab##cccccccccccc##..",
-"#ab##cccccccccccc##...",
-"#b##cccccccccccc##....",
-"###cccccccccccc##.....",
-"##cccccccccccc##......",
-"###############.......",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_save
-static const char *xpm_save[] = {
-"22 22 5 1",
-". c None",
-"# c #000000",
-"a c #838100",
-"b c #c5c2c5",
-"c c #cdb6d5",
-"......................",
-".####################.",
-".#aa#bbbbbbbbbbbb#bb#.",
-".#aa#bbbbbbbbbbbb#bb#.",
-".#aa#bbbbbbbbbcbb####.",
-".#aa#bbbccbbbbbbb#aa#.",
-".#aa#bbbccbbbbbbb#aa#.",
-".#aa#bbbbbbbbbbbb#aa#.",
-".#aa#bbbbbbbbbbbb#aa#.",
-".#aa#bbbbbbbbbbbb#aa#.",
-".#aa#bbbbbbbbbbbb#aa#.",
-".#aaa############aaa#.",
-".#aaaaaaaaaaaaaaaaaa#.",
-".#aaaaaaaaaaaaaaaaaa#.",
-".#aaa#############aa#.",
-".#aaa#########bbb#aa#.",
-".#aaa#########bbb#aa#.",
-".#aaa#########bbb#aa#.",
-".#aaa#########bbb#aa#.",
-".#aaa#########bbb#aa#.",
-"..##################..",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_back
-static const char *xpm_back[] = {
-"22 22 3 1",
-". c None",
-"# c #000083",
-"a c #838183",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"...........######a....",
-"..#......##########...",
-"..##...####......##a..",
-"..###.###.........##..",
-"..######..........##..",
-"..#####...........##..",
-"..######..........##..",
-"..#######.........##..",
-"..########.......##a..",
-"...............a###...",
-"...............###....",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_tree_view
-static const char *xpm_tree_view[] = {
-"22 22 2 1",
-". c None",
-"# c #000000",
-"......................",
-"......................",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......########........",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......########........",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......#...............",
-"......########........",
-"......................",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_single_view
-static const char *xpm_single_view[] = {
-"22 22 2 1",
-". c None",
-"# c #000000",
-"......................",
-"......................",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"..........#...........",
-"......................",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_split_view
-static const char *xpm_split_view[] = {
-"22 22 2 1",
-". c None",
-"# c #000000",
-"......................",
-"......................",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......#......#........",
-"......................",
-"......................"};
-#endif
-
-#ifdef WANTS_xpm_symbol_no
-static const char *xpm_symbol_no[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_symbol_mod
-static const char *xpm_symbol_mod[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .        . ",
-" .        . ",
-" .   ..   . ",
-" .  ....  . ",
-" .  ....  . ",
-" .   ..   . ",
-" .        . ",
-" .        . ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_symbol_yes
-static const char *xpm_symbol_yes[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .        . ",
-" .        . ",
-" .      . . ",
-" .     .. . ",
-" . .  ..  . ",
-" . ....   . ",
-" .  ..    . ",
-" .        . ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_choice_no
-static const char *xpm_choice_no[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-"    ....    ",
-"  ..    ..  ",
-"  .      .  ",
-" .        . ",
-" .        . ",
-" .        . ",
-" .        . ",
-"  .      .  ",
-"  ..    ..  ",
-"    ....    ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_choice_yes
-static const char *xpm_choice_yes[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-"    ....    ",
-"  ..    ..  ",
-"  .      .  ",
-" .   ..   . ",
-" .  ....  . ",
-" .  ....  . ",
-" .   ..   . ",
-"  .      .  ",
-"  ..    ..  ",
-"    ....    ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_menu
-static const char *xpm_menu[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .        . ",
-" . ..     . ",
-" . ....   . ",
-" . ...... . ",
-" . ...... . ",
-" . ....   . ",
-" . ..     . ",
-" .        . ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_menu_inv
-static const char *xpm_menu_inv[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .......... ",
-" ..  ...... ",
-" ..    .... ",
-" ..      .. ",
-" ..      .. ",
-" ..    .... ",
-" ..  ...... ",
-" .......... ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_menuback
-static const char *xpm_menuback[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-" .......... ",
-" .        . ",
-" .     .. . ",
-" .   .... . ",
-" . ...... . ",
-" . ...... . ",
-" .   .... . ",
-" .     .. . ",
-" .        . ",
-" .......... ",
-"            "};
-#endif
-
-#ifdef WANTS_xpm_void
-static const char *xpm_void[] = {
-"12 12 2 1",
-"  c white",
-". c black",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            ",
-"            "};
-#endif

diff --git a/libs/images/images.h.patch b/libs/images/images.h.patch
deleted file mode 100644 (file)
index 023e8dd..0000000
--- a/libs/images/images.h.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/libs/images/images.h b/libs/images/images.h
---- a/libs/images/images.h
-+++ b/libs/images/images.h
-@@ -3,6 +3,7 @@
-  * Released under the terms of the GNU GPL v2.0.
-  */
- 
-+#ifdef WANTS_xpm_load
- static const char *xpm_load[] = {
- "22 22 5 1",
- ". c None",
-@@ -32,7 +33,9 @@
- "##cccccccccccc##......",
- "###############.......",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_save
- static const char *xpm_save[] = {
- "22 22 5 1",
- ". c None",
-@@ -62,7 +65,9 @@
- ".#aaa#########bbb#aa#.",
- "..##################..",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_back
- static const char *xpm_back[] = {
- "22 22 3 1",
- ". c None",
-@@ -90,7 +95,9 @@
- "......................",
- "......................",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_tree_view
- static const char *xpm_tree_view[] = {
- "22 22 2 1",
- ". c None",
-@@ -117,7 +124,9 @@
- "......########........",
- "......................",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_single_view
- static const char *xpm_single_view[] = {
- "22 22 2 1",
- ". c None",
-@@ -144,7 +153,9 @@
- "..........#...........",
- "......................",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_split_view
- static const char *xpm_split_view[] = {
- "22 22 2 1",
- ". c None",
-@@ -171,7 +182,9 @@
- "......#......#........",
- "......................",
- "......................"};
-+#endif
- 
-+#ifdef WANTS_xpm_symbol_no
- static const char *xpm_symbol_no[] = {
- "12 12 2 1",
- "  c white",
-@@ -188,7 +201,9 @@
- " .        . ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_symbol_mod
- static const char *xpm_symbol_mod[] = {
- "12 12 2 1",
- "  c white",
-@@ -205,7 +220,9 @@
- " .        . ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_symbol_yes
- static const char *xpm_symbol_yes[] = {
- "12 12 2 1",
- "  c white",
-@@ -222,7 +239,9 @@
- " .        . ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_choice_no
- static const char *xpm_choice_no[] = {
- "12 12 2 1",
- "  c white",
-@@ -239,7 +258,9 @@
- "  ..    ..  ",
- "    ....    ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_choice_yes
- static const char *xpm_choice_yes[] = {
- "12 12 2 1",
- "  c white",
-@@ -256,7 +277,9 @@
- "  ..    ..  ",
- "    ....    ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_menu
- static const char *xpm_menu[] = {
- "12 12 2 1",
- "  c white",
-@@ -273,7 +296,9 @@
- " .        . ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_menu_inv
- static const char *xpm_menu_inv[] = {
- "12 12 2 1",
- "  c white",
-@@ -290,7 +315,9 @@
- " .......... ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_menuback
- static const char *xpm_menuback[] = {
- "12 12 2 1",
- "  c white",
-@@ -307,7 +334,9 @@
- " .        . ",
- " .......... ",
- "            "};
-+#endif
- 
-+#ifdef WANTS_xpm_void
- static const char *xpm_void[] = {
- "12 12 2 1",
- "  c white",
-@@ -324,3 +353,4 @@
- "            ",
- "            ",
- "            "};
-+#endif

diff --git a/misc/kernel2kfrontends.list b/misc/kernel2kfrontends.list
index 3fed3fcc33366321451b34ee295cf3e7bdbeddf4..c735d03ba4a57660d1be011a5fa0a6f16e7fa65a 100644 (file)
--- a/misc/kernel2kfrontends.list
+++ b/misc/kernel2kfrontends.list
@@ -7,7 +7,7 @@ scripts/kconfig/nconf.gui.c                       -->  frontends/nconf/nconf.gui
 scripts/kconfig/nconf.h                           -->  frontends/nconf/nconf.h
 scripts/kconfig/qconf.cc                          -->  frontends/qconf/qconf.cc
 scripts/kconfig/qconf.h                           -->  frontends/qconf/qconf.h
-scripts/kconfig/images.c                          -->  libs/images/images.h
+scripts/kconfig/images.c                          -->  libs/images/images.c_orig
 scripts/kconfig/lxdialog/BIG.FAT.WARNING          -->  libs/lxdialog/BIG.FAT.WARNING
 scripts/kconfig/lxdialog/checklist.c              -->  libs/lxdialog/checklist.c
 scripts/kconfig/lxdialog/dialog.h                 -->  libs/lxdialog/dialog.h