[vte] build: Fix srcdir != builddir
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] build: Fix srcdir != builddir
- Date: Thu, 14 Jan 2016 18:42:48 +0000 (UTC)
commit 2273aea4ff19d9d929a2b9dd04f21cc407a83d98
Author: Debarshi Ray <debarshir gnome org>
Date: Thu Jan 14 18:19:03 2016 +0100
build: Fix srcdir != builddir
Fall out from b77cec8080cdb14541cf106a5afe5bb89718f0b7
https://bugzilla.gnome.org/show_bug.cgi?id=760635
src/Makefile.am | 2 +-
src/vte/vteglobals.h | 2 +-
src/vte/vtepty.h | 4 ++--
src/vte/vteregex.h | 2 +-
src/vte/vteterminal.h | 8 ++++----
src/vte/vteversion.h.in | 2 +-
src/vtetypebuiltins.h.template | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 490206d..19fe7ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,7 +182,7 @@ include $(INTROSPECTION_MAKEFILE)
Vte- VTE_API_VERSION@.gir: libvte-$(VTE_API_VERSION).la
Vte_ VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
-Vte_ VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(builddir)/vte
+Vte_ VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(builddir)/vte -I$(srcdir)/vte
Vte_ VTE_API_VERSION_U@_gir_LIBS = libvte-$(VTE_API_VERSION).la
Vte_ VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION)
Vte_ VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
diff --git a/src/vte/vteglobals.h b/src/vte/vteglobals.h
index 08eff71..3433346 100644
--- a/src/vte/vteglobals.h
+++ b/src/vte/vteglobals.h
@@ -21,7 +21,7 @@
#include <glib.h>
-#include "vte/vtemacros.h"
+#include "vtemacros.h"
G_BEGIN_DECLS
diff --git a/src/vte/vtepty.h b/src/vte/vtepty.h
index dabef60..fe4bbdf 100644
--- a/src/vte/vtepty.h
+++ b/src/vte/vtepty.h
@@ -25,8 +25,8 @@
#include <gio/gio.h>
-#include "vte/vteenums.h"
-#include "vte/vtemacros.h"
+#include "vteenums.h"
+#include "vtemacros.h"
G_BEGIN_DECLS
diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h
index 7e236de..7169668 100644
--- a/src/vte/vteregex.h
+++ b/src/vte/vteregex.h
@@ -25,7 +25,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "vte/vtemacros.h"
+#include "vtemacros.h"
G_BEGIN_DECLS
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 1c5fb69..1479e98 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -28,10 +28,10 @@
#include <pango/pango.h>
#include <gtk/gtk.h>
-#include "vte/vteenums.h"
-#include "vte/vtemacros.h"
-#include "vte/vtepty.h"
-#include "vte/vteregex.h"
+#include "vteenums.h"
+#include "vtemacros.h"
+#include "vtepty.h"
+#include "vteregex.h"
#if defined(VTE_COMPILATION) && defined(__cplusplus)
class VteTerminalPrivate;
diff --git a/src/vte/vteversion.h.in b/src/vte/vteversion.h.in
index a60eb63..f558c8f 100644
--- a/src/vte/vteversion.h.in
+++ b/src/vte/vteversion.h.in
@@ -25,7 +25,7 @@
#include <glib.h>
-#include "vte/vtemacros.h"
+#include "vtemacros.h"
G_BEGIN_DECLS
diff --git a/src/vtetypebuiltins.h.template b/src/vtetypebuiltins.h.template
index 7f3c868..3f7b9dc 100644
--- a/src/vtetypebuiltins.h.template
+++ b/src/vtetypebuiltins.h.template
@@ -8,7 +8,7 @@
#include <glib-object.h>
-#include "vte/vtemacros.h"
+#include "vtemacros.h"
G_BEGIN_DECLS
/*** END file-header ***/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]