diff options
| author | Richard Hughes <richard@hughsie.com> | 2015-03-16 17:42:35 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2015-03-16 17:42:35 +0000 |
| commit | f630bcff91da73fe7b10e373ee19840c7c4e5512 (patch) | |
| tree | e43163c91edf2c7df718588fa4a05a6476b2c065 | |
| parent | ba0071747a60ec2fec3da09ce8e9238e114e11ec (diff) | |
| download | appstream-glib-f630bcff91da73fe7b10e373ee19840c7c4e5512.tar.gz | |
Remove the gtk3 dep from libappstream-glib
We still need this in the builder, but this is optional.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libappstream-builder/Makefile.am | 2 | ||||
| -rw-r--r-- | libappstream-builder/plugins/Makefile.am | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f646e8d..d3b0c28 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,8 @@ AM_CONDITIONAL(HAVE_GPERF, [test x$GPERF != xno]) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.1 gio-2.0 gobject-2.0 gthread-2.0 gio-unix-2.0 gmodule-2.0) PKG_CHECK_MODULES(LIBARCHIVE, libarchive) PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.24) -PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= 2.14 gtk+-3.0) +PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= 2.14) +PKG_CHECK_MODULES(GTK, gtk+-3.0) PKG_CHECK_MODULES(SQLITE, sqlite3) PKG_CHECK_MODULES(FREETYPE, pango fontconfig freetype2 >= 9.10.0) AC_PATH_PROG(GCAB, [gcab], [no]) diff --git a/libappstream-builder/Makefile.am b/libappstream-builder/Makefile.am index 0dc076f..e31351d 100644 --- a/libappstream-builder/Makefile.am +++ b/libappstream-builder/Makefile.am @@ -15,6 +15,7 @@ endif AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GDKPIXBUF_CFLAGS) \ + $(GTK_CFLAGS) \ $(OSTREE_CFLAGS) \ $(SOUP_CFLAGS) \ -I$(top_srcdir)/libappstream-glib \ @@ -88,6 +89,7 @@ libappstream_builder_la_LIBADD = \ $(ALPM_LIBS) \ $(OSTREE_LIBS) \ $(GLIB_LIBS) \ + $(GTK_LIBS) \ $(LIBARCHIVE_LIBS) libappstream_builder_la_LDFLAGS = \ diff --git a/libappstream-builder/plugins/Makefile.am b/libappstream-builder/plugins/Makefile.am index 2b258b1..695bebc 100644 --- a/libappstream-builder/plugins/Makefile.am +++ b/libappstream-builder/plugins/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ $(GDKPIXBUF_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ $(LIBARCHIVE_CFLAGS) \ $(SOUP_CFLAGS) \ $(RPM_CFLAGS) \ @@ -126,7 +127,7 @@ libasb_plugin_ibus_xml_la_CFLAGS = $(GLIB_CFLAGS) $(WARNINGFLAGS_C) libasb_plugin_font_la_SOURCES = asb-plugin-font.c libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS) libasb_plugin_font_la_LDFLAGS = -module -avoid-version -libasb_plugin_font_la_CFLAGS = $(GLIB_CFLAGS) $(WARNINGFLAGS_C) +libasb_plugin_font_la_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(WARNINGFLAGS_C) if HAVE_OSTREE libasb_plugin_ostree_la_SOURCES = asb-plugin-ostree.c |