fribidi.patch

uclinux 下的vlc播放器源代码

diff -ruNa fribidi.old/Makefile.in fribidi/Makefile.in
--- fribidi.old/Makefile.in	Sun May 19 12:17:19 2002
+++ fribidi/Makefile.in	Sun Nov  2 00:51:37 2003
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
 
 ACLOCAL = @ACLOCAL@
@@ -45,12 +43,15 @@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,13 +60,18 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
 CPP = @CPP@
+DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
-EXEEXT = @EXEEXT@
 FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
 FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
 FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
@@ -75,67 +81,136 @@
 FRIBIDI_NO_CHARSETS = @FRIBIDI_NO_CHARSETS@
 FRIBIDI_RPM_RELEASE = @FRIBIDI_RPM_RELEASE@
 FRIBIDI_VERSION = @FRIBIDI_VERSION@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SED = @SED@
 STRIP = @STRIP@
 VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnu 
 
-noinst_PROGRAMS = fribidi_benchmark			fribidi_create_char_types			fribidi_create_mirroring
-
-
-libfribidi_charsets =  	fribidi_char_sets.c		fribidi_char_sets_utf8.c
-
-
-libfribidi_charsets_extra =  	fribidi_char_sets_cap_rtl.c		fribidi_char_sets_iso8859_6.c		fribidi_char_sets_iso8859_8.c		fribidi_char_sets_cp1255.c		fribidi_char_sets_cp1256.c		fribidi_char_sets_isiri_3342.c
-
-
-libfribidi_charsets_h =  	fribidi_char_sets.h		fribidi_char_sets_utf8.h
-
-libfribidi_charsets_extra_h =  	fribidi_char_sets_cap_rtl.h		fribidi_char_sets_cp1255.h		fribidi_char_sets_cp1256.h		fribidi_char_sets_isiri_3342.h		fribidi_char_sets_iso8859_6.h		fribidi_char_sets_iso8859_8.h
+noinst_PROGRAMS = fribidi_benchmark	\
+		fribidi_create_char_types	\
+		fribidi_create_mirroring
+
+
+libfribidi_charsets = \
+	fribidi_char_sets.c	\
+	fribidi_char_sets_utf8.c
+
+
+libfribidi_charsets_extra = \
+	fribidi_char_sets_cap_rtl.c	\
+	fribidi_char_sets_iso8859_6.c	\
+	fribidi_char_sets_iso8859_8.c	\
+	fribidi_char_sets_cp1255.c	\
+	fribidi_char_sets_cp1256.c	\
+	fribidi_char_sets_isiri_3342.c
+
+
+libfribidi_charsets_h = \
+	fribidi_char_sets.h	\
+	fribidi_char_sets_utf8.h
+
+libfribidi_charsets_extra_h = \
+	fribidi_char_sets_cap_rtl.h	\
+	fribidi_char_sets_cp1255.h	\
+	fribidi_char_sets_cp1256.h	\
+	fribidi_char_sets_isiri_3342.h	\
+	fribidi_char_sets_iso8859_6.h	\
+	fribidi_char_sets_iso8859_8.h
 
 
 lib_LTLIBRARIES = libfribidi.la
 
-libfribidi_la_SOURCES =  	fribidi.c		fribidi_types.c			fribidi_mem.c		fribidi_mirroring.c		fribidi_char_type.c		fribidi_wcwidth.c		fribidi_utils.c		$(libfribidi_charsets)		$(libfribidi_charsets_extra)
+libfribidi_la_SOURCES = \
+	fribidi.c	\
+	fribidi_types.c		\
+	fribidi_mem.c	\
+	fribidi_mirroring.c	\
+	fribidi_char_type.c	\
+	fribidi_wcwidth.c	\
+	fribidi_utils.c	\
+	$(libfribidi_charsets)	\
+	$(libfribidi_charsets_extra)
 
 
 libfribidi_la_LIBADD = 
 
 libfribidiincdir = $(includedir)/fribidi
 
-libfribidiinc_HEADERS =  	fribidi.h		fribidi_types.h		fribidi_mem.h		fribidi_unicode.h		$(libfribidi_charsets_h)		$(libfribidi_charsets_extra_h)		fribidi_config.h
+libfribidiinc_HEADERS = \
+	fribidi.h	\
+	fribidi_types.h	\
+	fribidi_mem.h	\
+	fribidi_unicode.h	\
+	$(libfribidi_charsets_h)	\
+	$(libfribidi_charsets_extra_h)	\
+	fribidi_config.h
 
 
-GETOPT_SRC =  	getopt.c		getopt1.c
+GETOPT_SRC = \
+	getopt.c	\
+	getopt1.c
 
 
-GETOPT_HDR =  	getopt.h
+GETOPT_HDR = \
+	getopt.h
 
 
-TEST_FILES =  	tests/test_CapRTL_explicit.input		tests/test_CapRTL_explicit.reference		tests/test_CapRTL_implicit.input		tests/test_CapRTL_implicit.reference		tests/test_ISO8859-8_hebrew.input		tests/test_ISO8859-8_hebrew.reference		tests/test_UTF-8_persian.input		tests/test_UTF-8_persian.reference
+TEST_FILES = \
+	tests/test_CapRTL_explicit.input	\
+	tests/test_CapRTL_explicit.reference	\
+	tests/test_CapRTL_implicit.input	\
+	tests/test_CapRTL_implicit.reference	\
+	tests/test_ISO8859-8_hebrew.input	\
+	tests/test_ISO8859-8_hebrew.reference	\
+	tests/test_UTF-8_persian.input	\
+	tests/test_UTF-8_persian.reference
 
 
-TABLE_FILES =  	fribidi_tab_mirroring.i		fribidi_tab_char_type_2.i		fribidi_tab_char_type_9.i
+TABLE_FILES = \
+	fribidi_tab_mirroring.i	\
+	fribidi_tab_char_type_2.i	\
+	fribidi_tab_char_type_9.i
 
 
-UNIDATA_FILES =  	unidata/README		unidata/UnicodeData.txt		unidata/BidiMirroring.txt
+UNIDATA_FILES = \
+	unidata/README	\
+	unidata/UnicodeData.txt	\
+	unidata/BidiMirroring.txt
 
 
-OTHER_FILES =  	fribidi_wcwidth.i
+OTHER_FILES = \
+	fribidi_wcwidth.i
 
 
-EXTRA_HEADERS =  	packtab.h		$(GETOPT_HDR)
+EXTRA_HEADERS = \
+	packtab.h	\
+	$(GETOPT_HDR)
 
 
-EXTRA_DIST =  	bootstrap 	run.tests		ANNOUNCE		acinclude.m4		fribidi_config.h.in		fribidi.pc.in		fribidi.spec.in		fribidi.spec		$(TEST_FILES)		$(TABLE_FILES)		$(UNIDATA_FILES)		$(OTHER_FILES)		$(EXTRA_HEADERS)
+EXTRA_DIST = \
+	bootstrap \
+	run.tests	\
+	ANNOUNCE	\
+	acinclude.m4	\
+	fribidi_config.h.in	\
+	fribidi.pc.in	\
+	fribidi.spec.in	\
+	fribidi.spec	\
+	$(TEST_FILES)	\
+	$(TABLE_FILES)	\
+	$(UNIDATA_FILES)	\
+	$(OTHER_FILES)	\
+	$(EXTRA_HEADERS)
 
 
 fribidi_benchmark_SOURCES = fribidi_benchmark.c $(GETOPT_SRC)
@@ -161,620 +236,607 @@
 DISTCLEANFILES = fribidi_tab_char_type_stamp
 
 MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  fribidi_config.h fribidi-config fribidi.pc \
-fribidi.spec
-LTLIBRARIES =  $(lib_LTLIBRARIES)
+CONFIG_CLEAN_FILES = fribidi_config.h fribidi-config fribidi.pc \
+	fribidi.spec
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+libfribidi_la_LDFLAGS =
+libfribidi_la_DEPENDENCIES =
+am__objects_1 = fribidi_char_sets.lo fribidi_char_sets_utf8.lo
+am__objects_2 = fribidi_char_sets_cap_rtl.lo \
+	fribidi_char_sets_iso8859_6.lo fribidi_char_sets_iso8859_8.lo \
+	fribidi_char_sets_cp1255.lo fribidi_char_sets_cp1256.lo \
+	fribidi_char_sets_isiri_3342.lo
+am_libfribidi_la_OBJECTS = fribidi.lo fribidi_types.lo fribidi_mem.lo \
+	fribidi_mirroring.lo fribidi_char_type.lo fribidi_wcwidth.lo \
+	fribidi_utils.lo $(am__objects_1) $(am__objects_2)
+libfribidi_la_OBJECTS = $(am_libfribidi_la_OBJECTS)
+bin_PROGRAMS = fribidi$(EXEEXT)
+noinst_PROGRAMS = fribidi_benchmark$(EXEEXT) \
+	fribidi_create_char_types$(EXEEXT) \
+	fribidi_create_mirroring$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+
+am__objects_3 = getopt.$(OBJEXT) getopt1.$(OBJEXT)
+am_fribidi_OBJECTS = fribidi_main.$(OBJEXT) $(am__objects_3)
+fribidi_OBJECTS = $(am_fribidi_OBJECTS)
+fribidi_DEPENDENCIES = libfribidi.la
+fribidi_LDFLAGS =
+am_fribidi_benchmark_OBJECTS = fribidi_benchmark.$(OBJEXT) \
+	$(am__objects_3)
+fribidi_benchmark_OBJECTS = $(am_fribidi_benchmark_OBJECTS)
+fribidi_benchmark_DEPENDENCIES = libfribidi.la
+fribidi_benchmark_LDFLAGS =
+am_fribidi_create_char_types_OBJECTS = \
+	fribidi_create_char_types.$(OBJEXT) packtab.$(OBJEXT)
+fribidi_create_char_types_OBJECTS = \
+	$(am_fribidi_create_char_types_OBJECTS)
+fribidi_create_char_types_LDADD = $(LDADD)
+fribidi_create_char_types_DEPENDENCIES =
+fribidi_create_char_types_LDFLAGS =
+am_fribidi_create_mirroring_OBJECTS = fribidi_create_mirroring.$(OBJEXT)
+fribidi_create_mirroring_OBJECTS = \
+	$(am_fribidi_create_mirroring_OBJECTS)
+fribidi_create_mirroring_LDADD = $(LDADD)
+fribidi_create_mirroring_DEPENDENCIES =
+fribidi_create_mirroring_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libfribidi_la_LDFLAGS = 
-libfribidi_la_DEPENDENCIES = 
-libfribidi_la_OBJECTS =  fribidi.lo fribidi_types.lo fribidi_mem.lo \
-fribidi_mirroring.lo fribidi_char_type.lo fribidi_wcwidth.lo \
-fribidi_utils.lo fribidi_char_sets.lo fribidi_char_sets_utf8.lo \
-fribidi_char_sets_cap_rtl.lo fribidi_char_sets_iso8859_6.lo \
-fribidi_char_sets_iso8859_8.lo fribidi_char_sets_cp1255.lo \
-fribidi_char_sets_cp1256.lo fribidi_char_sets_isiri_3342.lo
-bin_PROGRAMS =  fribidi$(EXEEXT)
-noinst_PROGRAMS =  fribidi_benchmark$(EXEEXT) \
-fribidi_create_char_types$(EXEEXT) fribidi_create_mirroring$(EXEEXT)
-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
-
-fribidi_OBJECTS =  fribidi_main.$(OBJEXT) getopt.$(OBJEXT) \
-getopt1.$(OBJEXT)
-fribidi_DEPENDENCIES =  libfribidi.la
-fribidi_LDFLAGS = 
-fribidi_benchmark_OBJECTS =  fribidi_benchmark.$(OBJEXT) \
-getopt.$(OBJEXT) getopt1.$(OBJEXT)
-fribidi_benchmark_DEPENDENCIES =  libfribidi.la
-fribidi_benchmark_LDFLAGS = 
-fribidi_create_char_types_OBJECTS =  fribidi_create_char_types.$(OBJEXT) \
-packtab.$(OBJEXT)
-fribidi_create_char_types_LDADD = $(LDADD)
-fribidi_create_char_types_DEPENDENCIES = 
-fribidi_create_char_types_LDFLAGS = 
-fribidi_create_mirroring_OBJECTS =  fribidi_create_mirroring.$(OBJEXT)
-fribidi_create_mirroring_LDADD = $(LDADD)
-fribidi_create_mirroring_DEPENDENCIES = 
-fribidi_create_mirroring_LDFLAGS = 
-SCRIPTS =  $(bin_SCRIPTS)
-
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fribidi.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/fribidi_benchmark.Po \