Commit b3b7ea8e authored by Allison Karlitskaya's avatar Allison Karlitskaya

Replace -I with $(glib_INCLUDES) and friends

Stop using ad hoc -I in all of our Makefile.am.  Use the new variables
instead.
parent 8ad9d9db
......@@ -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 = \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
## 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
......
......@@ -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)"\"
......
......@@ -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 \
......
......@@ -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) \
......
## 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
......
......@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
noinst_LTLIBRARIES = libcharset.la
......
......@@ -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 \
......
......@@ -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)
......
......@@ -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 \
......
......@@ -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
......
......@@ -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 \
......
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
......
......@@ -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@ \
......
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 \
......
......@@ -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
......
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
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment