Replace -I with $(glib_INCLUDES) and friends

Stop using ad hoc -I in all of our Makefile.am.  Use the new variables
instead.
This commit is contained in:
Ryan Lortie
2010-08-06 13:09:26 -04:00
parent 8ad9d9dbe3
commit b3b7ea8e22
23 changed files with 23 additions and 84 deletions

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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

View File

@@ -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)"\"

View File

@@ -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 \