[gtk+/wip/ebassi/gsk-renderer: 24/126] build: Add GSK deps to GTK
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/ebassi/gsk-renderer: 24/126] build: Add GSK deps to GTK
- Date: Tue, 9 Aug 2016 16:32:45 +0000 (UTC)
commit c462f3ef2ef7cf4a8a816c8621aba6555225bfc8
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Apr 20 16:00:45 2016 +0100
build: Add GSK deps to GTK
gtk/Makefile.am | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ed6c224..d6b2f8a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -27,6 +27,8 @@ AM_CPPFLAGS = \
-I$(top_builddir)/gtk \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/gsk \
$(GMODULE_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
@@ -80,10 +82,12 @@ endif
libadd = \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
deps = \
- $(top_builddir)/gdk/libgdk-3.la
+ $(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -1561,7 +1565,7 @@ Gtk_3_0_gir_CFLAGS = \
$(AM_CPPFLAGS) \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_FILES = $(introspection_files)
-Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
+Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la $(top_builddir)/gsk/libgsk-3.la
Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
INTROSPECTION_GIRS = Gtk-3.0.gir
@@ -1589,6 +1593,7 @@ gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtkutils.c
gtk_query_immodules_3_0_LDADD = \
libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
@@ -1599,24 +1604,28 @@ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
gtk_encode_symbolic_svg_LDADD = \
$(GDK_PIXBUF_LIBS) \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GTK_DEP_LIBS)
gtk_builder_tool_SOURCES = gtk-builder-tool.c
gtk_builder_tool_LDADD = \
libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GTK_DEP_LIBS)
gtk_query_settings_SOURCES = gtk-query-settings.c
gtk_query_settings_LDADD= \
libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GTK_DEP_LIBS)
gtk_launch_SOURCES = gtk-launch.c
gtk_launch_LDADD = \
libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
+ $(top_builddir)/gsk/libgsk-3.la \
$(GTK_DEP_LIBS)
if OS_WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]