diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 17:12:02 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 17:12:02 -0600 |
commit | 2a815aa47083c49b9a809056004bd9a01e87221c (patch) | |
tree | e41801257e0cd4e27dc3516d8fd8216104a4c648 /misc/tools/kconfig-frontends/frontends | |
parent | 638c1a6dc07b438efa220c5345e94c3a963505ca (diff) | |
download | nuttx-2a815aa47083c49b9a809056004bd9a01e87221c.tar.gz nuttx-2a815aa47083c49b9a809056004bd9a01e87221c.tar.bz2 nuttx-2a815aa47083c49b9a809056004bd9a01e87221c.zip |
Restore trainling whitespace in .patch and .diff files wehre required
Diffstat (limited to 'misc/tools/kconfig-frontends/frontends')
7 files changed, 12 insertions, 12 deletions
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 _ |