From 030d1d74a00fe9e4a4ff83dd64c733b48c4a5d16 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Tue, 26 Nov 2002 13:37:10 +0000 Subject: Do not add GLIB_CFLAGS to CFLAGS. 2002-11-26 Sebastian Wilhelmi * configure.in: Do not add GLIB_CFLAGS to CFLAGS. * docs/Makefile.am, examples/Makefile.am, modules/arabic/Makefile.am, modules/basic/Makefile.am, modules/hangul/Makefile.am, modules/hebrew/Makefile.am, modules/indic/Makefile.am, modules/tamil/Makefile.am, modules/thai/Makefile.am, pango/Makefile.am, pango/mini-fribidi/Makefile.am, pango/opentype/Makefile.am: Instead add $(GLIB_CFLAGS) directly to INCLUDES (GTKDOC_CFLAGS for docs/Makefile.am). Also some cosmetic line wrapping and reindentation. --- modules/thai/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'modules/thai/Makefile.am') diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 9a80ccad..84d49a65 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -48,7 +48,16 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(moddefine) \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_thai_x_la_LIBADD = $(thai_x_libadd) -- cgit v1.2.1