[recipes/system-tab: 5/7] Define versions of libgd and libglnx
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes/system-tab: 5/7] Define versions of libgd and libglnx
- Date: Fri, 6 Jan 2017 18:14:30 +0000 (UTC)
commit 35b2454b5401f049fd9976bf3d224ce60f11a9e4
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jan 6 09:24:09 2017 -0500
Define versions of libgd and libglnx
This will be used in the about dialog eventually.
Makefile.am | 12 ++++++++++--
src/Makefile.am | 4 ++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c9c3c7c..bfab553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
SUBDIRS = . libgd tools data src po tests
-EXTRA_DIST = AUTHORS NEWS
+EXTRA_DIST = AUTHORS NEWS libgd.info libglnx.info
-CLEANFILES = AUTHORS NEWS
+CLEANFILES = AUTHORS NEWS libgd.info libglnx.info
+
+BUILT_SOURCES = libgd.info libglnx.info
AUTHORS:
$(AM_V_GEN)if test -d "$(srcdir)/.git"; \
@@ -24,6 +26,12 @@ NEWS: data/appdata/org.gnome.Recipes.appdata.xml.in
touch $@; \
fi
+libgd.info:
+ $(AM_V_GEN)(cd libgd; git log -1 --pretty=%h) > $@
+
+libglnx.info:
+ $(AM_V_GEN)(cd libglnx; git log -1 --pretty=%h) > $@
+
.PHONY: NEWS
# Generate the ChangeLog.
diff --git a/src/Makefile.am b/src/Makefile.am
index c20ff4f..ef04dc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
bin_PROGRAMS = recipes
commitid := $(shell $(GIT) describe)
+libgd_info = $(shell cat $(top_builddir)/libgd.info)
+libglnx_info = $(shell cat $(top_builddir)/libglnx.info)
recipes_CFLAGS = \
$(WARN_CFLAGS) \
@@ -10,6 +12,8 @@ recipes_CFLAGS = \
-DPKGDATADIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(localedir)\" \
-DCOMMIT_ID=\"$(commitid)\" \
+ -DLIBGD_INFO=\"$(libgd_info)\" \
+ -DLIBGLNX_INFO=\"$(libglnx_info)\" \
-DMICRO_VERSION=$(MICRO_VERSION) \
-I "$(top_srcdir)/libgd" \
-I "$(top_srcdir)/libglnx"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]