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

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

View File

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