[gnome-disk-utility] Fix support for builddir != srcdir



commit dca9e3523bc858b01f92872e4cd00b1957ac4728
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Jun 3 13:15:33 2016 +0100

    Fix support for builddir != srcdir
    
    The inclusion paths need to be updated to ensure that all autogenerated
    headers are found.

 src/disk-image-mounter/Makefile.am |    2 ++
 src/disks/Makefile.am              |    4 ++++
 src/libgdu/Makefile.am             |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/disk-image-mounter/Makefile.am b/src/disk-image-mounter/Makefile.am
index 9a1589b..1f36198 100644
--- a/src/disk-image-mounter/Makefile.am
+++ b/src/disk-image-mounter/Makefile.am
@@ -9,7 +9,9 @@ gnome_disk_image_mounter_SOURCES =                      \
 
 gnome_disk_image_mounter_CPPFLAGS =                    \
        -I$(top_srcdir)/src/                            \
+       -I$(top_srcdir)/src/libgdu                      \
        -I$(top_builddir)/src/                          \
+       -I$(top_builddir)/src/libgdu                    \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\"             \
        -DG_LOG_DOMAIN=\"gnome-disk-image-mounter\"     \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/src/disks/Makefile.am b/src/disks/Makefile.am
index c83b6de..6e49695 100644
--- a/src/disks/Makefile.am
+++ b/src/disks/Makefile.am
@@ -66,7 +66,11 @@ gnome_disks_SOURCES =                                                        \
 
 gnome_disks_CPPFLAGS =                                         \
        -I$(top_srcdir)/src/                            \
+       -I$(top_srcdir)/src/disks                       \
+       -I$(top_srcdir)/src/libgdu                      \
        -I$(top_builddir)/src/                          \
+       -I$(top_builddir)/src/disks                     \
+       -I$(top_builddir)/src/libgdu                    \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\"             \
        -DG_LOG_DOMAIN=\"GNOME-Disks\"                  \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/src/libgdu/Makefile.am b/src/libgdu/Makefile.am
index 59ec738..4189e30 100644
--- a/src/libgdu/Makefile.am
+++ b/src/libgdu/Makefile.am
@@ -32,7 +32,9 @@ libgdu_la_SOURCES =                                                   \
 
 libgdu_la_CPPFLAGS =                                   \
        -I$(top_srcdir)/src/                            \
+       -I$(top_srcdir)/src/libgdu                      \
        -I$(top_builddir)/src/                          \
+       -I$(top_srcdir)/src/libgdu                      \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\"             \
        -DG_LOG_DOMAIN=\"libgdu\"                       \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \


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