summaryrefslogtreecommitdiff
path: root/modules/arabic
diff options
context:
space:
mode:
authorJames Henstridge <james@daa.com.au>2003-03-11 12:31:16 +0000
committerJames Henstridge <jamesh@src.gnome.org>2003-03-11 12:31:16 +0000
commitbdd7e7f65c9f97b397b4ebe2550a6c2752adfe08 (patch)
tree26110dd7a72388712a01aad97aa1ce4ed29f4eb1 /modules/arabic
parent411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (diff)
downloadpango-bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08.tar.gz
make similar changes to the ones on glib head (call gtk-docize, etc).
2003-03-11 James Henstridge <james@daa.com.au> * autogen.sh: make similar changes to the ones on glib head (call gtk-docize, etc). * configure.in: move some calculations into M4 macros, rather than calculating them when configure runs. Use AC_HELP_STRING where appropriate. Replace gtk-doc checks with a call to GTK_DOC_CHECK. Replace AC_OUTPUT_COMMANDS() call with a number of calls to AC_CONFIG_COMMANDS (once per created file). Get rid of the "chmod +x pango-config" bit, because there is no pango-config anymore. * Makefile.am: get rid of custom distcheck rule, and set DISTCHECK_CONFIGURE_FLAGS, which is equivalent. Use += to select which .pc files to install. * pango/Makefile.am: Add rules to rebuild module-defs* files, and remove them on clean. Reorder so that rules related to each individual library are next to each other. Use BUILT_SOURCES for built sources. * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. * modules/*/Makefile.am: simplify module makefiles through use of +=, and regularise them a bit (fixed a few bugs in the process). * docs/Makefile.am: remove common rules, and instead include gtk-doc.make. * examples/Makefile.am: add pango.modules to CLEANFILES. * tests/Makefile.am: remove temporary files on clean.
Diffstat (limited to 'modules/arabic')
-rw-r--r--modules/arabic/Makefile.am131
1 files changed, 53 insertions, 78 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 0345b283..3aeafb90 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -5,21 +5,31 @@ pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $
pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
-if HAVE_XFT
-if INCLUDE_ARABIC_XFT
-XFT_MODULES=
-XFT_INCLUDED=libpango-arabic-xft.la
-XFT_PREFIX=-DXFT_MODULE_PREFIX
-else
-XFT_MODULES=pango-arabic-xft.la
-XFT_INCLUDED=
-XFT_PREFIX=
-arabic_xft_libadd=$(pangoxftlibs)
+INCLUDES = \
+ -DPANGO_ENABLE_ENGINE \
+ -DG_DISABLE_DEPRECATED \
+ $(PANGO_DEBUG_FLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/pango/ \
+ $(GLIB_CFLAGS)
+
+moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
+module_LTLIBRARIES =
+noinst_LTLIBRARIES =
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
endif
+
+
+if HAVE_X
+INCLUDES += $(X_CFLAGS)
+if INCLUDE_ARABIC_X
+noinst_LTLIBRARIES += libpango-arabic-x.la
+INCLUDES += -DX_MODULE_PREFIX
else
-XFT_MODULES=
-XFT_INCLUDED=
-XFT_PREFIX=
+module_LTLIBRARIES += pango-arabic-x.la
+endif
endif
x_sources = \
@@ -33,89 +43,54 @@ x_sources = \
naqshfont.h \
arconv.h
+pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_x_la_LIBADD = $(pangoxlibs)
+pango_arabic_x_la_SOURCES = $(x_sources)
+libpango_arabic_x_la_SOURCES = $(x_sources)
+
+
+if HAVE_XFT
+INCLUDES += $(XFT_CFLAGS)
+if INCLUDE_ARABIC_XFT
+noinst_LTLIBRARIES += libpango-arabic-xft.la
+INCLUDES += -DXFT_MODULE_PREFIX
+else
+module_LTLIBRARIES += pango-arabic-xft.la
+endif
+endif
+
xft_sources = \
arabic-xft.c \
arabic-ot.c \
arabic-ot.h
-ft2_sources = \
- arabic-ft2.c \
- arabic-ot.c \
- arabic-ot.h
+pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_xft_la_LIBADD = $(pangoxftlibs)
+pango_arabic_xft_la_SOURCES = $(xft_sources)
+libpango_arabic_xft_la_SOURCES = $(xft_sources)
-if HAVE_X
-if INCLUDE_ARABIC_X
-X_MODULES=
-X_INCLUDED=libpango-arabic-x.la
-X_PREFIX=-DX_MODULE_PREFIX
-else
-X_MODULES=pango-arabic-x.la
-X_INCLUDED=
-X_PREFIX=
-arabic_x_libadd=$(pangoxlibs)
-endif
-else
-X_MODULES=
-X_INCLUDED=
-X_PREFIX=
-endif
if HAVE_FREETYPE
+INCLUDES += $(FREETYPE_CFLAGS)
if INCLUDE_ARABIC_FT2
-FT2_MODULES=
-FT2_INCLUDED=libpango-arabic-ft2.la
-FT2_PREFIX=-DFT2_MODULE_PREFIX
-else
-FT2_MODULES=pango-arabic-ft2.la
-FT2_INCLUDED=
-FT2_PREFIX=
-arabic_ft2_libadd=$(pangoft2libs)
-endif
+noinst_LTLIBRARIES += libpango-arabic-ft2.la
+INCLUDES += -DFT2_MODULE_PREFIX
else
-FT2_MODULES=
-FT2_INCLUDED=
-FT2_PREFIX=
+module_LTLIBRARIES += pango-arabic-ft2.la
endif
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
endif
-noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED)
-module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
-moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
-moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-
-INCLUDES = \
- -DPANGO_ENABLE_ENGINE \
- -DG_DISABLE_DEPRECATED \
- $(PANGO_DEBUG_FLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/pango/ \
- $(moddefine) \
- $(GLIB_CFLAGS) \
- $(XFT_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(X_CFLAGS)
-
-pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_arabic_x_la_LIBADD = $(arabic_x_libadd)
-pango_arabic_x_la_SOURCES = $(x_sources)
-
-libpango_arabic_x_la_SOURCES = $(x_sources)
-
-pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
-pango_arabic_xft_la_LIBADD = $(arabic_xft_libadd)
-pango_arabic_xft_la_SOURCES = $(xft_sources)
-
-libpango_arabic_xft_la_SOURCES = $(xft_sources)
+ft2_sources = \
+ arabic-ft2.c \
+ arabic-ot.c \
+ arabic-ot.h
pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
-pango_arabic_ft2_la_LIBADD = $(arabic_ft2_libadd)
+pango_arabic_ft2_la_LIBADD = $(pangoft2libs)
pango_arabic_ft2_la_SOURCES = $(ft2_sources)
-
libpango_arabic_ft2_la_SOURCES = $(ft2_sources)
+
included-modules: $(noinst_LTLIBRARIES)
.PHONY: included-modules