From 786e9c1a65ad02284a487d9abb9a96f6cdc1ee4e Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Mar 31 2011 18:32:59 +0000 Subject: mkctype is no longer useful. --- diff --git a/loader/.gitignore b/loader/.gitignore index 021a962..c894638 100644 --- a/loader/.gitignore +++ b/loader/.gitignore @@ -1,5 +1,3 @@ -ctype.c -mkctype loader init debug.log diff --git a/loader/Makefile.am b/loader/Makefile.am index dc6f5fe..ebcc5f7 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -23,8 +23,7 @@ shareddir = $(datadir)/$(PACKAGE_NAME) boot_PROGRAMS = loader shared_DATA = loader.tr dist_shared_DATA = unicode-linedraw-chars.txt -noinst_PROGRAMS = mkctype dirbrowser -noinst_DATA = ctype.c +noinst_PROGRAMS = dirbrowser noinst_HEADERS = *.h if IS_S390 @@ -65,16 +64,13 @@ init_SOURCES = init.c undomounts.c shutdown.c copy.c modules.c \ shutdown_CFLAGS = $(COMMON_CFLAGS) -DAS_SHUTDOWN=1 shutdown_SOURCES = shutdown.c undomounts.c -mkctype_CFLAGS = $(COMMON_CFLAGS) -mkctype_SOURCES = mkctype.c - dirbrowser_CFLAGS = $(COMMON_CFLAGS) -DSTANDALONE dirbrowser_LDADD = $(NEWT_LIBS) dirbrowser_SOURCES = dirbrowser.c EXTRA_DIST = simplemot keymaps-* -CLEANFILES = keymaps-override-$(ARCH) ctype.c tr/*.tr +CLEANFILES = keymaps-override-$(ARCH) tr/*.tr MAINTAINERCLEANFILES = Makefile.in @@ -86,10 +82,6 @@ cp_verbose = $(cp_verbose_$(V)) cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) cp_verbose_0 = @echo " CP "$@; -mkctype_verbose = $(mkctype_verbose_$(V)) -mkctype_verbose_ = $(mkctype_verbose_$(AM_DEFAULT_VERBOSITY)) -mkctype_verbose_0 = @echo " MAKE "$@; - msgmerge_verbose = $(msgmerge_verbose_$(V)) msgmerge_verbose_ = $(msgmerge_verbose_$(AM_DEFAULT_VERBOSITY)) msgmerge_verbose_0 = echo " MERGE "$${lang}.po; @@ -101,9 +93,6 @@ xgettext_verbose_0 = @echo " GETTXT "$@; keymaps-override-$(ARCH): keymaps-$(ARCH) $(cp_verbose)cp -p $< $@ -ctype.c: mkctype - $(mkctype_verbose)./mkctype > ctype.c - loader.tr: $(top_srcdir)/data/lang-table loader.po @LANGS="`cut -f 2 $(top_srcdir)/data/lang-table | egrep -v '(^en$$)'`" ; \ if [ ! -d tr ]; then \ diff --git a/loader/mkctype.c b/loader/mkctype.c deleted file mode 100644 index 12eaba0..0000000 --- a/loader/mkctype.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * mkctype.c - * - * Copyright (C) 2007 Red Hat, Inc. All rights reserved. - * - * 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 2 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 . - */ - -#include -#include - -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) -# define __ctype_b (*__ctype_b_loc()) -# define __ctype_tolower (*__ctype_tolower_loc()) -# define __ctype_toupper (*__ctype_toupper_loc()) -#endif - -int main(int argc, char ** argv) { - int i; - - printf("#include \n\n"); - - printf("static const unsigned short int __ctype_b_internal[] = {"); - - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_b[i]); - } - - printf("\n};\n\n"); - printf("const unsigned short int * __ctype_b = __ctype_b_internal + 128;\n\n"); - - printf("const int __ctype_toupper_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_toupper[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_toupper = __ctype_toupper_internal + 128;\n\n"); - - printf("const int __ctype_tolower_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_tolower[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_tolower = __ctype_tolower_internal + 128;\n\n"); - - printf ("const unsigned short int **__ctype_b_loc (void) { return &__ctype_b; }\n"); - printf ("const int **__ctype_toupper_loc (void) { return &__ctype_toupper; }\n"); - printf ("const int **__ctype_tolower_loc (void) { return &__ctype_tolower; }\n\n"); - - return 0; -};