diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2016-04-20 16:00:45 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-10-18 11:29:34 +0100 |
| commit | 0e2a87a4bcccae77c7881f2e34cd68df9308b98d (patch) | |
| tree | aa4ae35afe4f0091e02d9002af594e8dde508fe9 /gtk/Makefile.am | |
| parent | 7afdd3fdb5c5fda9da87555b40a61e6a321c2414 (diff) | |
| download | gtk+-0e2a87a4bcccae77c7881f2e34cd68df9308b98d.tar.gz | |
build: Add GSK deps to GTK
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 3b3ace5125..4d94114a72 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) \ $(GTK_WARN_CFLAGS) \ @@ -81,10 +83,12 @@ endif libadd = \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) deps = \ - $(top_builddir)/gdk/libgdk-4.la + $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la # libtool stuff: set version and export symbols for resolving # since automake doesn't support conditionalized libsomething_la_LDFLAGS @@ -1531,7 +1535,7 @@ Gtk_4_0_gir_CFLAGS = \ $(AM_CPPFLAGS) \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API Gtk_4_0_gir_FILES = $(introspection_files) -Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gdk/libgdk-4.la +Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gsk/libgsk-4.la $(top_builddir)/gdk/libgdk-4.la Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0 INTROSPECTION_GIRS = Gtk-4.0.gir @@ -1559,6 +1563,7 @@ gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c gtk_query_immodules_4_0_LDADD = \ libgtk-4.la \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) @@ -1569,24 +1574,28 @@ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c gtk_encode_symbolic_svg_LDADD = \ $(GDK_PIXBUF_LIBS) \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk_builder_tool_SOURCES = gtk-builder-tool.c gtk_builder_tool_LDADD = \ libgtk-4.la \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk_query_settings_SOURCES = gtk-query-settings.c gtk_query_settings_LDADD= \ libgtk-4.la \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk_launch_SOURCES = gtk-launch.c gtk_launch_LDADD = \ libgtk-4.la \ $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) if OS_WIN32 |