Add $(top_builddir)/glib to includes

This is required to find glibconfig.h during srcdir != builddir builds
This commit is contained in:
paul 2010-08-05 09:08:34 -04:00 committed by Ryan Lortie
parent 38c3f9964c
commit 9f6faaffb6
11 changed files with 12 additions and 2 deletions

View File

@ -43,6 +43,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) \ $(GLIB_DEBUG_FLAGS) \
$(THREAD_FLAGS) \ $(THREAD_FLAGS) \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \

View File

@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gobject \ -I$(top_srcdir)/gobject \
-I$(top_srcdir)/gio \ -I$(top_srcdir)/gio \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) \ $(GLIB_DEBUG_FLAGS) \
-DSRCDIR=\""$(srcdir)"\" -DSRCDIR=\""$(srcdir)"\"

View File

@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -DG_LOG_DOMAIN=\"GLib\" \ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib \
-DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
noinst_LTLIBRARIES = libgnulib.la noinst_LTLIBRARIES = libgnulib.la

View File

@ -4,6 +4,7 @@ INCLUDES = \
-g \ -g \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_builddir)/glib \
-DSRCDIR=\""$(srcdir)"\" \ -DSRCDIR=\""$(srcdir)"\" \
$(GLIB_DEBUG_FLAGS) $(GLIB_DEBUG_FLAGS)

View File

@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
-DG_LOG_DOMAIN=\"GModule\" \ -DG_LOG_DOMAIN=\"GModule\" \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED

View File

@ -17,6 +17,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) \ $(GLIB_DEBUG_FLAGS) \
$(THREAD_FLAGS) \ $(THREAD_FLAGS) \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \

View File

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib $(GLIB_DEBUG_FLAGS) INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
noinst_PROGRAMS = $(TEST_PROGS) noinst_PROGRAMS = $(TEST_PROGS)
libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la

View File

@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gthread \ -I$(top_srcdir)/gthread \
-I$(top_builddir)/glib \
-DG_LOG_DOMAIN=\"GThread\" \ -DG_LOG_DOMAIN=\"GThread\" \
@GTHREAD_COMPILE_IMPL_DEFINES@ \ @GTHREAD_COMPILE_IMPL_DEFINES@ \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \

View File

@ -6,6 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) $(GLIB_DEBUG_FLAGS)
AM_CFLAGS = -g AM_CFLAGS = -g

View File

@ -4,6 +4,7 @@ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) $(GLIB_DEBUG_FLAGS)
libglib = $(top_builddir)/glib/libglib-2.0.la libglib = $(top_builddir)/glib/libglib-2.0.la

View File

@ -4,6 +4,7 @@ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glib \ -I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(GLIB_DEBUG_FLAGS) $(GLIB_DEBUG_FLAGS)
libglib = $(top_builddir)/glib/libglib-2.0.la libglib = $(top_builddir)/glib/libglib-2.0.la