From 3961e54d055a45b4ed096a08c661bf2a00a77a41 Mon Sep 17 00:00:00 2001 From: behdad Date: Wed, 28 Apr 2004 03:20:22 +0000 Subject: [PATCH] Cleaning up exported symbols. --- THANKS | 23 +++++++--------- bin/fribidi-main.c | 62 ++++++++++++++++++++++---------------------- charset/Makefile.am | 13 +--------- doc/Makefile.am | 1 + lib/Makefile.am | 16 ++++++------ lib/fribidi-common.h | 8 +++--- 6 files changed, 55 insertions(+), 68 deletions(-) diff --git a/THANKS b/THANKS index 2aedf76..a4ad064 100644 --- a/THANKS +++ b/THANKS @@ -1,33 +1,30 @@ Thanks to: - -Members of the Linux-il and Arabeyes communities - * For the feedbacks. - * For the constant pressure on keep the wheel rolling. - -Mark Davis - * For writing the Unicode Standard Annex #9. - +Behnam Esfahbod + * Maintaining the mailing list and CVS repository. And for the previous versions of FriBidi (up to 2002), thanks to: +Tomas Frydrych + * Contirbuted patches for compiling GNU FriBidi under other OSes. + Dov Grobgeld * Initial author, and maintainer before the 0.9 releases. Franck Portaneri * For the Mozilla BiDi languges support document; -Owen Tayler - * Contributed very important memory leak and speed patches. +Roozbeh Pournader + * Fixed small things here and there. Pablo Saratxaga * Contributed several arabic charset converters. +Owen Tayler + * Contributed very important memory leak and speed patches. + Omer Zak * Contributed several bug fixes, and several considerations for embedded systems. - -Roozbeh Pournader - * Fixed small things here and there. diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c index 60d8fbf..1f64156 100644 --- a/bin/fribidi-main.c +++ b/bin/fribidi-main.c @@ -1,10 +1,10 @@ /* FriBidi * fribidi-main.c - command line program for libfribidi * - * $Id: fribidi-main.c,v 1.1 2004-04-25 18:47:57 behdad Exp $ + * $Id: fribidi-main.c,v 1.2 2004-04-28 03:20:22 behdad Exp $ * $Author: behdad $ - * $Date: 2004-04-25 18:47:57 $ - * $Revision: 1.1 $ + * $Date: 2004-04-28 03:20:22 $ + * $Revision: 1.2 $ * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/bin/fribidi-main.c,v $ * * Authors: @@ -200,17 +200,17 @@ main ( FILE *IN; text_width = 80; - do_break = TRUE; - do_pad = TRUE; - do_mirror = TRUE; - do_clean = FALSE; - do_reorder_nsm = FALSE; - show_input = FALSE; - show_visual = TRUE; - show_basedir = FALSE; - show_ltov = FALSE; - show_vtol = FALSE; - show_levels = FALSE; + do_break = true; + do_pad = true; + do_mirror = true; + do_clean = false; + do_reorder_nsm = false; + show_input = false; + show_visual = true; + show_basedir = false; + show_ltov = false; + show_vtol = false; + show_levels = false; char_set = "UTF-8"; bol_text = NULL; eol_text = NULL; @@ -245,24 +245,24 @@ main ( {"charsetdesc", 1, 0, CHARSETDESC}, {"caprtl", 0, 0, CAPRTL}, #endif /* FRIBIDI_MAIN_USE_ICONV_H */ - {"showinput", 0, &show_input, TRUE}, - {"nopad", 0, &do_pad, FALSE}, - {"nobreak", 0, &do_break, FALSE}, + {"showinput", 0, &show_input, true}, + {"nopad", 0, &do_pad, false}, + {"nobreak", 0, &do_break, false}, {"width", 1, 0, 'w'}, {"bol", 1, 0, 'B'}, {"eol", 1, 0, 'E'}, - {"nomirror", 0, &do_mirror, FALSE}, - {"reordernsm", 0, &do_reorder_nsm, TRUE}, - {"clean", 0, &do_clean, TRUE}, + {"nomirror", 0, &do_mirror, false}, + {"reordernsm", 0, &do_reorder_nsm, true}, + {"clean", 0, &do_clean, true}, {"ltr", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_L}, {"rtl", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_R}, {"wltr", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_WL}, {"wrtl", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_WR}, - {"basedir", 0, &show_basedir, TRUE}, - {"ltov", 0, &show_ltov, TRUE}, - {"vtol", 0, &show_vtol, TRUE}, - {"levels", 0, &show_levels, TRUE}, - {"novisual", 0, &show_visual, FALSE}, + {"basedir", 0, &show_basedir, true}, + {"ltov", 0, &show_ltov, true}, + {"vtol", 0, &show_vtol, true}, + {"levels", 0, &show_levels, true}, + {"novisual", 0, &show_visual, false}, {0, 0, 0, 0} }; @@ -283,7 +283,7 @@ main ( version (); break; case 'v': - show_basedir = show_ltov = show_vtol = show_levels = TRUE; + show_basedir = show_ltov = show_vtol = show_levels = true; break; case 'w': text_width = atoi (optarg); @@ -297,14 +297,14 @@ main ( eol_text = optarg; break; case 'd': - if (!fribidi_set_debug (TRUE)) + if (!fribidi_set_debug (true)) die1 ("lib" FRIBIDI " must be compiled with DEBUG option to enable\nturn debug info on.\n"); break; case 't': - do_clean = show_input = do_reorder_nsm = TRUE; - do_break = FALSE; + do_clean = show_input = do_reorder_nsm = true; + do_break = false; break; case 'c': char_set = strdup (optarg); @@ -354,13 +354,13 @@ main ( fribidi_set_mirroring (do_mirror); fribidi_set_reorder_nsm (do_reorder_nsm); exit_val = 0; - file_found = FALSE; + file_found = false; while (optind < argc || !file_found) { char *S_; S_ = optind < argc ? argv[optind++] : "-"; - file_found = TRUE; + file_found = true; /* Open the infile for reading */ if (S_[0] == '-' && !S_[1]) diff --git a/charset/Makefile.am b/charset/Makefile.am index 0c7004f..526e0fc 100644 --- a/charset/Makefile.am +++ b/charset/Makefile.am @@ -8,21 +8,10 @@ AM_CPPFLAGS = \ pkginclude_HEADERS = libfribidi_char_sets_la_LDFLAGS = -libfribidi_char_sets_la_LIBADD = +libfribidi_char_sets_la_LIBADD = $(GLIB_LIBS) if FRIBIDI_CHARSETS -if PLATFORM_WIN32 -no_undefined = -no-undefined -endif # PLATFORM_WIN32 - -libfribidi_char_sets_la_LDFLAGS += $(no_undefined) -libfribidi_char_sets_la_LIBADD += $(GLIB_LIBS) - -if OS_WIN32 -libfribidi_char_sets_la_LDFLAGS += -export-symbols -endif # OS_WIN32 - include Headers.mk pkginclude_HEADERS += $(libfribidi_char_sets_la_headers) diff --git a/doc/Makefile.am b/doc/Makefile.am index c91268c..41b46d2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -34,6 +34,7 @@ man3 = $(dist_man_MANS) $(dist_noinst_MANS) MAINTAINERCLEANFILES = $(man3) C2MANFLAGS = $(includepath) -DDONT_HAVE_FRIBIDI_CONFIG_H -M "$(PACKAGE_NAME)" +VPATH += $(includevpath) c2man.stamp: $(headers) @$(RM) $@.tmp diff --git a/lib/Makefile.am b/lib/Makefile.am index c715d0e..042dbb3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,17 +2,17 @@ lib_LTLIBRARIES = libfribidi.la AM_CPPFLAGS = $(GLIB_CFLAGS) -if PLATFORM_WIN32 -no_undefined = -no-undefined -endif # PLATFORM_WIN32 - -libfribidi_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) +libfribidi_la_LDFLAGS = -version-info $(LT_VERSION_INFO) libfribidi_la_LIBADD = $(GLIB_LIBS) libfribidi_la_DEPENDENCIES = -if OS_WIN32 -libfribidi_la_LDFLAGS += -export-symbols -endif # OS_WIN32 +if PLATFORM_WIN32 +libfribidi_la_LDFLAGS += -no-undefined +endif # PLATFORM_WIN32 + +#if OS_WIN32 +#libfribidi_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.sym +#endif # OS_WIN32 if FRIBIDI_CHARSETS diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h index 0a71af5..06933bc 100644 --- a/lib/fribidi-common.h +++ b/lib/fribidi-common.h @@ -1,10 +1,10 @@ /* FriBidi * fribidi-common.h - common include for library headers * - * $Id: fribidi-common.h,v 1.1 2004-04-25 18:47:57 behdad Exp $ + * $Id: fribidi-common.h,v 1.2 2004-04-28 03:20:22 behdad Exp $ * $Author: behdad $ - * $Date: 2004-04-25 18:47:57 $ - * $Revision: 1.1 $ + * $Date: 2004-04-28 03:20:22 $ + * $Revision: 1.2 $ * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-common.h,v $ * * Author: @@ -47,7 +47,7 @@ /* FRIBIDI_NAMESPACE is a macro used to name library symbols. */ #ifndef FRIBIDI_NAMESPACE -# define FRIBIDI_NAMESPACE(SYMBOL) fribidi_##SYMBOL +# define FRIBIDI_NAMESPACE(SYMBOL) fribidi##_##SYMBOL #endif /* !FRIBIDI_NAMESPACE */ /* FRIBIDI_ENTRY is a macro used to declare library entry points. */ -- 2.40.0