Fold charset into lib

Now “make -C lib” works.

diff --git a/Makefile.am b/Makefile.am
index 4767d69efb42623ecd9ca1728aed8332d7e83a46..af1dab0c5849bd701f66dc33abf79fb7cfa2f507 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 ## The order of subdirs is important, don't change without a reason.
-SUBDIRS = gen.tab charset lib bin doc test
+SUBDIRS = gen.tab lib bin doc test
 
 EXTRA_DIST = autogen.sh ChangeLog.old
 

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4b4f3cda01f1f89afcdc67ba707815025568c424..d3de41b20cb0599989a4e638e37b0411f6c8ded3 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -10,8 +10,7 @@ fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
 
 AM_CPPFLAGS = \
                -I$(top_builddir)/lib \
-               -I$(top_srcdir)/lib \
-               -I$(top_srcdir)/charset
+               -I$(top_srcdir)/lib
 
 LDADD = $(top_builddir)/lib/libfribidi.la
 

diff --git a/charset/Headers.mk b/charset/Headers.mk
deleted file mode 100644 (file)
index 8fb3dbf..0000000
--- a/charset/Headers.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-libfribidi_char_sets_la_headers = \
-               fribidi-char-sets.h \
-               fribidi-char-sets-list.h
-
-libfribidi_char_sets_la_symbols = \
-               fribidi_charset_to_unicode \
-               fribidi_unicode_to_charset \
-               fribidi_parse_charset

diff --git a/charset/Makefile.am b/charset/Makefile.am
deleted file mode 100644 (file)
index 62e4efe..0000000
--- a/charset/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-noinst_LTLIBRARIES = libfribidi-char-sets.la
-
-AM_CPPFLAGS = \
-               -I$(top_builddir)/lib \
-               -I$(top_srcdir)/lib
-
-pkginclude_HEADERS =
-
-libfribidi_char_sets_la_LDFLAGS = 
-libfribidi_char_sets_la_LIBADD = $(GLIB_LIBS)
-
-include Headers.mk
-pkginclude_HEADERS += $(libfribidi_char_sets_la_headers)
-
-libfribidi_char_sets_la_SOURCES = \
-       fribidi-char-sets.c \
-       fribidi-char-sets-cap-rtl.c \
-       fribidi-char-sets-cp1255.c \
-       fribidi-char-sets-cp1256.c \
-       fribidi-char-sets-iso8859-6.c \
-       fribidi-char-sets-iso8859-8.c \
-       fribidi-char-sets-utf8.c \
-       fribidi-char-sets-cap-rtl.h \
-       fribidi-char-sets-cp1255.h \
-       fribidi-char-sets-cp1256.h \
-       fribidi-char-sets-iso8859-6.h \
-       fribidi-char-sets-iso8859-8.h \
-       fribidi-char-sets-utf8.h
-
-$(top_builddir)/config.h: $(top_srcdir)/config.h.in
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
-
-$(top_builddir)/lib/fribidi-config.h: $(top_srcdir)/lib/fribidi-config.h.in
-       cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) fribidi-config.h
-
--include $(top_srcdir)/git.mk

diff --git a/configure.ac b/configure.ac
index 2d5fda5b5f7bc81a2a826f8bb2ff71bef7f6fee1..f05abb64f976aaffc69848e1c4aa312d616c6239 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,6 @@ AM_CONDITIONAL([FRIBIDI_ENABLE_DOC], [test -n "$C2MAN"])
 AC_CONFIG_FILES([fribidi.pc
                 lib/fribidi-config.h
                 Makefile
-                charset/Makefile
                 gen.tab/Makefile
                 lib/Makefile
                 bin/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2289ecbe81b51e405b92348eb9607888bf4a1590..6a67f2a0ab7cb9c955322a4a3c365dc08b0c9f18 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,12 +13,6 @@ headers =
 inst_symbols =
 noinst_symbols =
 
-include $(top_srcdir)/charset/Headers.mk
-headers += $(libfribidi_char_sets_la_headers)
-includepath += -I$(top_srcdir)/charset
-includevpath += :$(top_srcdir)/charset
-inst_symbols += $(libfribidi_char_sets_la_symbols)
-
 # The lib/Headers.mk stuff should come after all optional stuff.
 include $(top_srcdir)/lib/Headers.mk
 headers += $(libfribidi_la_headers)

diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index d178fc998fe642941ea26a7db0d74e6424b73680..fe3c80f6571b3c432acf2ce8bcf718676d0412bf 100644 (file)
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -32,8 +32,7 @@ DISTCLEANFILES =
 
 AM_CPPFLAGS = \
                -I$(top_builddir)/lib \
-               -I$(top_srcdir)/lib \
-               -I$(top_srcdir)/charset
+               -I$(top_srcdir)/lib
 
 UCD_FILES = \
                unidata/ReadMe.txt \

diff --git a/lib/Headers.mk b/lib/Headers.mk
index b8f54ef74ef432c72f0bbb14cf2c4b7274a811f6..2db988e5360257faf5a65298c86cbf92fd8de7c7 100644 (file)
--- a/lib/Headers.mk
+++ b/lib/Headers.mk
@@ -5,6 +5,8 @@ libfribidi_la_headers = \
                fribidi-bidi-types.h \
                fribidi-bidi-types-list.h \
                fribidi-common.h \
+               fribidi-char-sets.h \
+               fribidi-char-sets-list.h \
                fribidi-deprecated.h \
                fribidi-enddecls.h \
                fribidi-flags.h \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index eb5f1c24584348547b083b7061f01bb1f2fc1cb9..175248556b3acacc28c80ec7a36fdb9b348b0276 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,13 +14,6 @@ else
 libfribidi_la_LDFLAGS += -export-symbols-regex "^fribidi_.*"
 endif # OS_WIN32
 
-AM_CPPFLAGS += -I$(top_srcdir)/charset
-libfribidi_la_LIBADD += $(top_builddir)/charset/libfribidi-char-sets.la
-libfribidi_la_DEPENDENCIES += $(top_builddir)/charset/libfribidi-char-sets.la
-
-$(top_builddir)/charset/libfribidi-char-sets.la:
-       cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi-char-sets.la
-
 include Headers.mk
 pkginclude_HEADERS = $(libfribidi_la_headers)
 nodist_pkginclude_HEADERS = fribidi-config.h
@@ -36,6 +29,19 @@ libfribidi_la_SOURCES =      \
                fribidi-arabic.c \
                fribidi-bidi.c \
                fribidi-bidi-types.c \
+               fribidi-char-sets.c \
+               fribidi-char-sets-cap-rtl.c \
+               fribidi-char-sets-cp1255.c \
+               fribidi-char-sets-cp1256.c \
+               fribidi-char-sets-iso8859-6.c \
+               fribidi-char-sets-iso8859-8.c \
+               fribidi-char-sets-utf8.c \
+               fribidi-char-sets-cap-rtl.h \
+               fribidi-char-sets-cp1255.h \
+               fribidi-char-sets-cp1256.h \
+               fribidi-char-sets-iso8859-6.h \
+               fribidi-char-sets-iso8859-8.h \
+               fribidi-char-sets-utf8.h \
                fribidi-deprecated.c \
                fribidi-joining.c \
                fribidi-joining-types.c \

diff --git a/charset/fribidi-char-sets-cap-rtl.c b/lib/fribidi-char-sets-cap-rtl.c
similarity index 100%
rename from charset/fribidi-char-sets-cap-rtl.c
rename to lib/fribidi-char-sets-cap-rtl.c

diff --git a/charset/fribidi-char-sets-cap-rtl.h b/lib/fribidi-char-sets-cap-rtl.h
similarity index 100%
rename from charset/fribidi-char-sets-cap-rtl.h
rename to lib/fribidi-char-sets-cap-rtl.h

diff --git a/charset/fribidi-char-sets-cp1255.c b/lib/fribidi-char-sets-cp1255.c
similarity index 100%
rename from charset/fribidi-char-sets-cp1255.c
rename to lib/fribidi-char-sets-cp1255.c

diff --git a/charset/fribidi-char-sets-cp1255.h b/lib/fribidi-char-sets-cp1255.h
similarity index 100%
rename from charset/fribidi-char-sets-cp1255.h
rename to lib/fribidi-char-sets-cp1255.h

diff --git a/charset/fribidi-char-sets-cp1256.c b/lib/fribidi-char-sets-cp1256.c
similarity index 100%
rename from charset/fribidi-char-sets-cp1256.c
rename to lib/fribidi-char-sets-cp1256.c

diff --git a/charset/fribidi-char-sets-cp1256.h b/lib/fribidi-char-sets-cp1256.h
similarity index 100%
rename from charset/fribidi-char-sets-cp1256.h
rename to lib/fribidi-char-sets-cp1256.h

diff --git a/charset/fribidi-char-sets-iso8859-6.c b/lib/fribidi-char-sets-iso8859-6.c
similarity index 100%
rename from charset/fribidi-char-sets-iso8859-6.c
rename to lib/fribidi-char-sets-iso8859-6.c

diff --git a/charset/fribidi-char-sets-iso8859-6.h b/lib/fribidi-char-sets-iso8859-6.h
similarity index 100%
rename from charset/fribidi-char-sets-iso8859-6.h
rename to lib/fribidi-char-sets-iso8859-6.h

diff --git a/charset/fribidi-char-sets-iso8859-8.c b/lib/fribidi-char-sets-iso8859-8.c
similarity index 100%
rename from charset/fribidi-char-sets-iso8859-8.c
rename to lib/fribidi-char-sets-iso8859-8.c

diff --git a/charset/fribidi-char-sets-iso8859-8.h b/lib/fribidi-char-sets-iso8859-8.h
similarity index 100%
rename from charset/fribidi-char-sets-iso8859-8.h
rename to lib/fribidi-char-sets-iso8859-8.h

diff --git a/charset/fribidi-char-sets-list.h b/lib/fribidi-char-sets-list.h
similarity index 100%
rename from charset/fribidi-char-sets-list.h
rename to lib/fribidi-char-sets-list.h

diff --git a/charset/fribidi-char-sets-utf8.c b/lib/fribidi-char-sets-utf8.c
similarity index 100%
rename from charset/fribidi-char-sets-utf8.c
rename to lib/fribidi-char-sets-utf8.c

diff --git a/charset/fribidi-char-sets-utf8.h b/lib/fribidi-char-sets-utf8.h
similarity index 100%
rename from charset/fribidi-char-sets-utf8.h
rename to lib/fribidi-char-sets-utf8.h

diff --git a/charset/fribidi-char-sets.c b/lib/fribidi-char-sets.c
similarity index 100%
rename from charset/fribidi-char-sets.c
rename to lib/fribidi-char-sets.c

diff --git a/charset/fribidi-char-sets.h b/lib/fribidi-char-sets.h
similarity index 100%
rename from charset/fribidi-char-sets.h
rename to lib/fribidi-char-sets.h

diff --git a/lib/fribidi.def b/lib/fribidi.def
index 0d79a49cd7585c8ebd3c577631704081d19c8834..66f627a1cc53e0126c9828e535ed55731215d1d5 100644 (file)
--- a/lib/fribidi.def
+++ b/lib/fribidi.def
@@ -1,3 +1,4 @@
+fribidi_charset_to_unicode
 fribidi_debug_status
 fribidi_get_bidi_type
 fribidi_get_bidi_type_name
@@ -17,6 +18,7 @@ fribidi_join_arabic
 fribidi_log2vis
 fribidi_log2vis_get_embedding_levels
 fribidi_mirroring_status
+fribidi_parse_charset
 fribidi_remove_bidi_marks
 fribidi_reorder_line
 fribidi_reorder_nsm_status
@@ -26,5 +28,6 @@ fribidi_set_reorder_nsm
 fribidi_shape
 fribidi_shape_arabic
 fribidi_shape_mirroring
+fribidi_unicode_to_charset
 fribidi_unicode_version
 fribidi_version_info