diff options
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index f96bc6d..1752485 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,10 +2,10 @@ EXTRA_DIST = fribidi.def lib_LTLIBRARIES = libfribidi.la -AM_CPPFLAGS = $(MISC_CFLAGS) +AM_CPPFLAGS = libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO) -libfribidi_la_LIBADD = $(MISC_LIBS) +libfribidi_la_LIBADD = libfribidi_la_DEPENDENCIES = if OS_WIN32 @@ -14,17 +14,6 @@ else libfribidi_la_LDFLAGS += -export-symbols-regex "^fribidi_.*" endif # OS_WIN32 -if FRIBIDI_CHARSETS - -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 - -endif # FRIBIDI_CHARSETS - include Headers.mk pkginclude_HEADERS = $(libfribidi_la_headers) nodist_pkginclude_HEADERS = fribidi-config.h @@ -40,17 +29,31 @@ 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 \ - fribidi-mem.c \ fribidi-mirroring.c \ + fribidi-brackets.c \ fribidi-run.c \ fribidi-shape.c \ joining-type.tab.i \ joining-types.h \ - mem.h \ mirroring.tab.i \ + brackets.tab.i \ + brackets-type.tab.i \ run.h GENERATEDSOURCES = \ @@ -58,7 +61,9 @@ GENERATEDSOURCES = \ arabic-shaping.tab.i \ bidi-type.tab.i \ joining-type.tab.i \ - mirroring.tab.i + mirroring.tab.i \ + brackets.tab.i \ + brackets-type.tab.i BUILT_SOURCES = \ $(GENERATEDSOURCES) \ |