[epiphany] build: Fix srcdir != builddir from git



commit 8fe41d2fb949b982c4d475b8304745aa534b97e7
Author: Colin Walters <walters verbum org>
Date:   Tue Jan 7 18:47:36 2014 -0500

    build: Fix srcdir != builddir from git
    
    Continuous does srcdir != builddir from git. Now that we're including
    generates files from lib/widgets, we need $(builddir).

 embed/Makefile.am         |    1 +
 src/Makefile.am           |    2 ++
 src/bookmarks/Makefile.am |    1 +
 tests/Makefile.am         |    1 +
 4 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 04fa60f..5f6fec3 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -58,6 +58,7 @@ libephyembed_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/egg             \
        -I$(top_srcdir)/lib/history         \
        -I$(top_srcdir)/lib/widgets         \
+       -I$(top_builddir)/lib/widgets       \
        $(AM_CPPFLAGS)
 
 libephyembed_la_CFLAGS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 0aee05a..5145d31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,6 +86,7 @@ libephymain_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
+       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
        -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"               \
        -DDATADIR=\""$(pkgdatadir)"\"   \
@@ -145,6 +146,7 @@ epiphany_CPPFLAGS = \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
+       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
        -DDATADIR=\""$(datadir)"\"      \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 0e05730..49cf369 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -99,6 +99,7 @@ libephybookmarks_la_CPPFLAGS = \
        -I$(top_srcdir)/src             \
        -I$(top_srcdir)/embed           \
        -I$(top_srcdir)/lib/widgets     \
+       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/egg         \
        -DDATADIR=\""$(pkgdatadir)"\"   \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 87d6e13..aca37d7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,6 +96,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib      \
        -I$(top_srcdir)/lib/history \
        -I$(top_srcdir)/lib/widgets \
+       -I$(top_builddir)/lib/widgets \
        -I$(top_srcdir)/src      \
        -I$(top_srcdir)/src/bookmarks
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]