[gnome-software/wip/iainl/ubuntu-xenial: 36/56] Drop json-glib Makefile code that is provided from master
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/iainl/ubuntu-xenial: 36/56] Drop json-glib Makefile code that is provided from master
- Date: Thu, 14 Apr 2016 06:32:50 +0000 (UTC)
commit 5c8a2b1879f52374747e91d714de9f578109776d
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Feb 29 17:02:11 2016 +1300
Drop json-glib Makefile code that is provided from master
configure.ac | 1 -
src/plugins/Makefile.am | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e280d2b..b64752a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,6 @@ PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.51.92)
PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.11.5)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= 3.17.92)
-PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= 0.12)
AC_PATH_PROG(APPSTREAM_UTIL, [appstream-util], [unfound])
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 5d0bea1..20a1c09 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS = \
$(JSON_GLIB_CFLAGS) \
$(LIMBA_CFLAGS) \
$(XDG_APP_CFLAGS) \
- $(JSON_GLIB_CFLAGS) \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DGS_MODULESETDIR=\"$(datadir)/gnome-software/modulesets.d\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]