Do not add GLIB_CFLAGS to CFLAGS.

2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* 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.

19 files changed, 152 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 480b8cf7..a5830fb0 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,17 @@
+2002-11-26  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* 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.
+
 Mon Nov 25 20:25:23 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/glyphstring.c (pango_glyph_string_extents_range): 
diff --git a/configure.in b/configure.in
index 33d9477c..1fa8edb3 100644
--- a/configure.in
+++ b/configure.in
@@ -261,8 +261,6 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
 
 GLIB_CFLAGS=`$PKG_CONFIG --cflags gthread-2.0`
 
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f1063b2c..2e016cbb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -55,10 +55,10 @@ extra_files =				\
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =               				\
-	@CFLAGS@					\
 	-DPANGO_ENABLE_BACKEND				\
 	-I$(top_srcdir) 				\
-	-I$(top_builddir)
+	-I$(top_builddir)				\
+	$(GLIB_CFLAGS)
 
 GTKDOC_LIBS =               						\
 	$(top_builddir)/pango/libpango-1.0.la
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d1834f04..2256923e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,13 @@
 
 aliasdir = $(sysconfdir)/pango
 
-INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES =				\
+	-DG_DISABLE_DEPRECATED		\
+	-I$(top_srcdir)			\
+	$(QT_INCLUDES)			\
+	$(GLIB_CFLAGS)			\
+	$(FONTCONFIG_CFLAGS)		\
+	$(FREETYPE_CFLAGS)
 
 ###################################################
 
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 4c8ccfe4..f080ef38 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -86,7 +86,16 @@ 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 -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_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_arabic_x_la_LIBADD = $(arabic_x_libadd)
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 7e41eab3..82928498 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -88,11 +88,12 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 INCLUDES = 			\
 	-DPANGO_ENABLE_ENGINE	\
 	-DG_DISABLE_DEPRECATED	\
-	-I$(top_srcdir) 	\
-	-I$(top_srcdir)/pango/ 	\
-	$(XFT_CFLAGS) 		\
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/pango/	\
+	$(GLIB_CFLAGS)		\
+	$(XFT_CFLAGS)		\
 	$(FREETYPE_CFLAGS)	\
-	$(X_CFLAGS) 		\
+	$(X_CFLAGS)		\
 	$(moddefine)
 
 pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index cf8fd657..1ca234c7 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -47,7 +47,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_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_hangul_x_la_SOURCES = $(x_sources)
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index 5a02c277..b50c3afd 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -70,14 +70,15 @@ module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 
-INCLUDES = 			\
+INCLUDES =			\
 	-DPANGO_ENABLE_ENGINE	\
 	-DG_DISABLE_DEPRECATED	\
-	-I$(top_srcdir) 	\
-	-I$(top_srcdir)/pango/ 	\
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/pango/	\
+	$(GLIB_CFLAGS)		\
 	$(XFT_CFLAGS)		\
 	$(FREETYPE_CFLAGS)	\
-	$(X_CFLAGS) 		\
+	$(X_CFLAGS)		\
 	$(moddefine)
 
 pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 89f29a3c..5f3ea069 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -90,6 +90,7 @@ INCLUDES =					\
 	-DG_DISABLE_DEPRECATED			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/pango/			\
+	$(GLIB_CFLAGS)				\
 	$(XFT_CFLAGS)				\
 	$(X_CFLAGS)				\
 	$(myanmar_x_cflags)			\
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index 2f2f3bce..87879858 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -30,7 +30,15 @@ module_LTLIBRARIES = $(X_MODULES)
 moddefine = $(X_PREFIX)
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 
-INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(FREETYPE_CFLAGS) $(X_CFLAGS) 
+INCLUDES = 				\
+	-DPANGO_ENABLE_ENGINE		\
+	-DG_DISABLE_DEPRECATED		\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/pango/		\
+	$(moddefine)			\
+	$(GLIB_CFLAGS)			\
+	$(FREETYPE_CFLAGS)		\
+	$(X_CFLAGS) 
 
 pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_tamil_x_la_LIBADD = $(tamil_x_libadd)
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)
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 4b9dbfd9..8a2635a6 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -17,13 +17,14 @@ SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
 
 DIST_SUBDIRS = mini-fribidi opentype
 
-INCLUDES = 						\
+INCLUDES =						\
 	-DPANGO_ENABLE_BACKEND				\
 	-DPANGO_ENABLE_ENGINE				\
-	-DSYSCONFDIR=\"$(sysconfdir)\" 			\
-	-DLIBDIR=\"$(libdir)\" 				\
+	-DSYSCONFDIR=\"$(sysconfdir)\"			\
+	-DLIBDIR=\"$(libdir)\"				\
 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
 	-DG_DISABLE_DEPRECATED				\
+	$(GLIB_CFLAGS)					\
 	$(XFT_CFLAGS)					\
 	$(FONTCONFIG_CFLAGS)				\
 	$(FREETYPE_CFLAGS)				\
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index a27eccde..362c04e8 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = 					\
 	-DSYSCONFDIR=\"$(sysconfdir)\" 		\
 	-DLIBDIR=\"$(libdir)\" 			\
 	-DG_DISABLE_DEPRECATED			\
-	-I$(top_srcdir)
+	-I$(top_srcdir)				\
+	$(GLIB_CFLAGS)
 
 LDADDS = @STRIP_BEGIN@ 	\
 	@x_ldflags@	\
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index 0e33d59f..7374d030 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -2,9 +2,10 @@
 
 INCLUDES = 					\
 	-DPANGO_ENABLE_ENGINE			\
-	-DSYSCONFDIR=\"$(sysconfdir)\" 		\
-	-DLIBDIR=\"$(libdir)\" 			\
+	-DSYSCONFDIR=\"$(sysconfdir)\"		\
+	-DLIBDIR=\"$(libdir)\"			\
 	-DG_DISABLE_DEPRECATED			\
+	$(GLIB_CFLAGS)				\
 	$(FREETYPE_CFLAGS)			\
 	$(X_CFLAGS)				\
 	-I$(top_srcdir)