[gnome-builder] build: bump build requirements and simplify cflags/libs
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: bump build requirements and simplify cflags/libs
- Date: Tue, 23 Dec 2014 00:07:41 +0000 (UTC)
commit b99b36525796e55a82e79a14c1084ebc41b3cec6
Author: Christian Hergert <christian hergert me>
Date: Mon Dec 22 16:07:35 2014 -0800
build: bump build requirements and simplify cflags/libs
build/autotools/autoconf.d/50_dependencies.post-am | 10 +++++-----
src/gnome-builder.mk | 14 ++------------
2 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/build/autotools/autoconf.d/50_dependencies.post-am
b/build/autotools/autoconf.d/50_dependencies.post-am
index 78d8262..7602429 100644
--- a/build/autotools/autoconf.d/50_dependencies.post-am
+++ b/build/autotools/autoconf.d/50_dependencies.post-am
@@ -1,5 +1,5 @@
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.15.2)
-PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.40.0)
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-3.0 >= 3.14.0)
-PKG_CHECK_MODULES(DEVHELP, libdevhelp-3.0 >= 3.13.90)
-PKG_CHECK_MODULES(GGIT, libgit2-glib-1.0 >= 0.0.24)
+PKG_CHECK_MODULES(BUILDER, [gtk+-3.0 >= 3.15.3
+ gtksourceview-3.0 >= 3.15.3
+ libdevhelp-3.0 >= 3.14.0
+ libgit2-glib-1.0 >= 0.0.24])
+
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index 5adca0b..5cbda05 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -209,23 +209,13 @@ libgnome_builder_la_SOURCES = \
src/workbench/gb-workspace.h
libgnome_builder_la_LIBADD = \
- $(DEVHELP_LIBS) \
- $(GGIT_LIBS) \
- $(GIO_LIBS) \
- $(GTKSOURCEVIEW_LIBS) \
- $(GTK_LIBS) \
- $(WEBKIT_LIBS) \
+ $(BUILDER_LIBS) \
-lm
libgnome_builder_la_CFLAGS = \
-DPACKAGE_DATADIR="\"$(datadir)\"" \
- $(DEVHELP_CFLAGS) \
- $(GGIT_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GTKSOURCEVIEW_CFLAGS) \
- $(GTK_CFLAGS) \
+ $(BUILDER_CFLAGS) \
$(MAINTAINER_CFLAGS) \
- $(WEBKIT_CFLAGS) \
-I$(top_builddir)/src/util \
-I$(top_srcdir)/src/animation \
-I$(top_srcdir)/src/app \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]