[seahorse] build: Update includes to work with srcdir != builddir from git



commit 6a70791e8033fbc37f95beb1673d31a70eaf9a4a
Author: Colin Walters <walters verbum org>
Date:   Sun Nov 17 10:02:18 2013 -0500

    build: Update includes to work with srcdir != builddir from git
    
    seahorse-common.h is in $(builddir) when doing srcdir != builddir from
    git.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=712538

 gkr/Makefile.am         |    1 +
 libseahorse/Makefile.am |    2 ++
 pkcs11/Makefile.am      |    1 +
 src/Makefile.am         |    1 +
 ssh/Makefile.am         |    1 +
 5 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 46c6ac9..80d04cf 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -7,6 +7,7 @@ seahorselibexecbindir = $(libdir)/seahorse/
 AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libseahorse \
        $(SEAHORSE_CFLAGS) \
        -DSEAHORSE_UIDIR=\""$(uidir)/"\" \
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index e075410..927e0c9 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -5,7 +5,9 @@ seahorselibexecbindir = $(libdir)/seahorse/
 
 AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
+       -I$(top_builddir) \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libegg \
        $(SEAHORSE_CFLAGS) \
        -DPKGDATADIR=\""$(pkgdatadir)/"\" \
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 9f367ab..b8d8dbf 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -10,6 +10,7 @@ BUILT_SOURCES = libvala_code_la_vala.stamp
 AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libseahorse \
        $(SEAHORSE_CFLAGS) \
        -DSEAHORSE_UIDIR=\""$(uidir)"\" \
diff --git a/src/Makefile.am b/src/Makefile.am
index f9b0dcd..e663cd3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ localedir = $(datadir)/locale
 AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libseahorse \
        $(SEAHORSE_CFLAGS) \
        -DSEAHORSE_UIDIR=\""$(uidir)"\" \
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index ab012a1..f8d661a 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -6,6 +6,7 @@ seahorselibexecbindir = $(libdir)/seahorse/
 AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
+       -I$(top_builddir)/common \
        -I$(top_srcdir)/libseahorse \
        $(SEAHORSE_CFLAGS) \
        -DSEAHORSE_UIDIR=\""$(uidir)"\" \


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