Replace -I with $(glib_INCLUDES) and friends

Stop using ad hoc -I in all of our Makefile.am.  Use the new variables
instead.

diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 236d7ad..f5ef8c1 100644 (file)
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -116,15 +116,7 @@ IGNORE_HFILES=                             \
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 INCLUDES = \
-       -I$(srcdir)                     \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gobject         \
-       -I$(top_srcdir)/gio             \
-       -I$(top_builddir)               \
-       -I$(top_builddir)/glib          \
-       -I$(top_builddir)/gobject       \
-       -I$(top_builddir)/gio           \
+       $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)
 
 GTKDOC_LIBS = \

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index da513c9..d2adccd 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -32,10 +32,7 @@ IGNORE_HFILES = \
 # if $(DOC_MODULE).types is non-empty.
 INCLUDES = \
        -I$(srcdir)                     \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_builddir)               \
-       -I$(top_builddir)/glib          \
+       $(gobject_INCLUDES)             \
        $(GLIB_DEBUG_FLAGS)
 GTKDOC_LIBS = \
        $(top_builddir)/glib/libglib-2.0.la     \

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 2d82d31..54df3b2 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -39,11 +39,7 @@ endif
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"                     \
-       -I$(top_builddir)                               \
-       -I$(top_srcdir)                                 \
-       -I$(top_srcdir)/glib                            \
-       -I$(top_srcdir)/gmodule                         \
-       -I$(top_builddir)/glib                          \
+       $(gmodule_INCLUDES)                             \
        $(GLIB_DEBUG_FLAGS)                             \
        $(THREAD_FLAGS)                                 \
        -DG_DISABLE_DEPRECATED                          \

diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index e4183bd..c2865c7 100644 (file)
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -19,10 +19,7 @@ libgiofam_la_SOURCES =               \
 
 libgiofam_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_srcdir)/gio             \
+       $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DGIO_COMPILATION               \

diff --git a/gio/fen/Makefile.am b/gio/fen/Makefile.am
index d96da45..52af1cf 100644 (file)
--- a/gio/fen/Makefile.am
+++ b/gio/fen/Makefile.am
@@ -21,11 +21,7 @@ libfen_la_SOURCES =          \
 
 libfen_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_srcdir)/gio             \
-       -I$(top_builddir)/gio           \
+       $(gio_INCLUDES)                         \
        $(GLIB_DEBUG_FLAGS)             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DGIO_COMPILATION               \

diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am
index 725936b..8eb9e91 100644 (file)
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -25,11 +25,7 @@ libinotify_la_SOURCES =              \
 
 libinotify_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_srcdir)/gio             \
-       -I$(top_builddir)/gio           \
+       $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DGIO_COMPILATION               \

diff --git a/gio/libasyncns/Makefile.am b/gio/libasyncns/Makefile.am
index 80b20a2..2b69b6e 100644 (file)
--- a/gio/libasyncns/Makefile.am
+++ b/gio/libasyncns/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = $(config_h_INCLUDES)
 
 noinst_LTLIBRARIES = libasyncns.la
 

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 78fca6d..b0726e5 100644 (file)
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -4,12 +4,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                     \
        -g                      \
-       -I$(top_srcdir)         \
-       -I$(top_srcdir)/glib    \
-       -I$(top_srcdir)/gmodule \
-       -I$(top_srcdir)/gobject \
-       -I$(top_srcdir)/gio     \
-       -I$(top_builddir)/glib  \
+       $(gio_INCLUDES)         \
        $(GLIB_DEBUG_FLAGS)     \
        -DSRCDIR=\""$(srcdir)"\"
 

diff --git a/gio/win32/Makefile.am b/gio/win32/Makefile.am
index bb609e3..6f85a15 100644 (file)
--- a/gio/win32/Makefile.am
+++ b/gio/win32/Makefile.am
@@ -20,11 +20,7 @@ libgiowin32_la_SOURCES =                     \
 
 libgiowin32_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"GLib-GIO\"     \
-       -I$(top_builddir)/gio           \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_srcdir)/gio             \
+       $(gio_INCLUDES)                 \
        $(GLIB_DEBUG_FLAGS)             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
        -DGIO_COMPILATION               \

diff --git a/glib/Makefile.am b/glib/Makefile.am
index be85cb0..69f9028 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -53,7 +53,7 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
 DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
+       $(glib_INCLUDES)                \
        $(pcre_inc)                     \
        -DG_LOG_DOMAIN=\"GLib\"         \
        $(GLIB_DEBUG_FLAGS)             \

diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index 17f8d2e..ae8283d 100644 (file)
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib \
-       -DG_LOG_DOMAIN=\"GLib\" \
+INCLUDES = $(glib_INCLUDES) -DG_LOG_DOMAIN=\"GLib\" \
        $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
 noinst_LTLIBRARIES = libgnulib.la

diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am
index cfa3412..5571388 100644 (file)
--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                     \
-       -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
+       -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
 
 noinst_LTLIBRARIES = libcharset.la
 

diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index 826f318..07e8526 100644 (file)
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -13,10 +13,7 @@ INCLUDES = \
        -DLINK_SIZE=2 \
        -DPOSIX_MALLOC_THRESHOLD=10 \
        -DPCRE_STATIC \
-       -I$(top_srcdir) \
-       -I$(srcdir) \
-       -I$(top_srcdir)/glib \
-       -I$(top_builddir)/glib \
+       $(glib_INCLUDES) \
        @GLIB_DEBUG_FLAGS@ \
        -DG_DISABLE_DEPRECATED \
        -DGLIB_COMPILATION \

diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 5ccb57a..ab3cb25 100644 (file)
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                             \
        -g                              \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_builddir)/glib          \
+       $(glib_INCLUDES)                \
        -DSRCDIR=\""$(srcdir)"\"        \
        $(GLIB_DEBUG_FLAGS)
 

diff --git a/glib/update-pcre/Makefile.am-1 b/glib/update-pcre/Makefile.am-1
index d4255b7..8195460 100644 (file)
--- a/glib/update-pcre/Makefile.am-1
+++ b/glib/update-pcre/Makefile.am-1
@@ -12,9 +12,7 @@ INCLUDES = \
        -DEBCDIC=0 \
        -DPOSIX_MALLOC_THRESHOLD=10 \
        -DPCRE_STATIC \
-       -I$(top_srcdir) \
-       -I$(srcdir) \
-       -I$(top_srcdir)/glib \
+       $(glib_INCLUDES) \
        @GLIB_DEBUG_FLAGS@ \
        -DG_DISABLE_DEPRECATED \
        -DGLIB_COMPILATION \

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 0b142dd..cebfcb4 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -2,10 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_builddir)/glib          \
+       $(glib_INCLUDES)                \
        -DG_LOG_DOMAIN=\"GModule\"      \
        @GLIB_DEBUG_FLAGS@              \
        -DG_DISABLE_DEPRECATED

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 0219385..a9bc8a0 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -14,10 +14,7 @@ endif
 
 AM_CPPFLAGS =                                  \
        -DG_LOG_DOMAIN=\"GLib-GObject\"         \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/glib                    \
-       -I$(top_builddir)                       \
-       -I$(top_builddir)/glib                  \
+       $(gthread_INCLUDES)                     \
        $(GLIB_DEBUG_FLAGS)                     \
        $(THREAD_FLAGS)                         \
        -DG_DISABLE_DEPRECATED                  \

diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index 28a52b2..6efbcd9 100644 (file)
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
+INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
 
 noinst_PROGRAMS  = $(TEST_PROGS)
 libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 0fa5b7c..617c94a 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -5,10 +5,7 @@ SUBDIRS = . tests
 DIST_SUBDIRS = tests
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gthread         \
-       -I$(top_builddir)/glib          \
+       $(glib_INCLUDES)                \
        -DG_LOG_DOMAIN=\"GThread\"      \
        @GTHREAD_COMPILE_IMPL_DEFINES@  \
        @GLIB_DEBUG_FLAGS@              \

diff --git a/gthread/tests/Makefile.am b/gthread/tests/Makefile.am
index 1b59ff4..387098a 100644 (file)
--- a/gthread/tests/Makefile.am
+++ b/gthread/tests/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
+INCLUDES = -g $(gthread_INCLUDES) $(GLIB_DEBUG_FLAGS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
 progs_ldadd     = $(top_builddir)/glib/libglib-2.0.la \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29bb299..f6f527f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,10 +3,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS=gobject refcount
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
-       -I$(top_builddir)/glib          \
+       $(gmodule_INCLUDES)             \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g

diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index ef18168..cf97ac3 100644 (file)
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -1,10 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                                     \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/glib                    \
-       -I$(top_srcdir)/gmodule                 \
-       -I$(top_builddir)/glib                  \
+       $(gmodule_INCLUDES)                     \
        $(GLIB_DEBUG_FLAGS)
 
 libglib = $(top_builddir)/glib/libglib-2.0.la

diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index 3bbeaa3..f904c1f 100644 (file)
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -1,10 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                                     \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/glib                    \
-       -I$(top_srcdir)/gmodule                 \
-       -I$(top_builddir)/glib                  \
+       $(gmodule_INCLUDES)                     \
        $(GLIB_DEBUG_FLAGS)
 
 libglib = $(top_builddir)/glib/libglib-2.0.la