[gexiv2] build: Make --disable-vala work
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gexiv2] build: Make --disable-vala work
- Date: Fri, 8 Sep 2017 18:10:27 +0000 (UTC)
commit 5b55914be1f2a656998a0c25ade37d706bda6851
Author: Debarshi Ray <debarshir gnome org>
Date: Fri Sep 8 19:32:26 2017 +0200
build: Make --disable-vala work
All Vala related activity and artifacts should be encapsulated within
ENABLE_VAPIGEN.
https://bugzilla.gnome.org/show_bug.cgi?id=787455
Makefile.am | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f11433a..2c87482 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = . docs
+CLEANFILES =
+
# Installation directories.
pkgconfigdir = $(libdir)/pkgconfig
GEXIV2_publicdir = $(includedir)/gexiv2
@@ -21,7 +23,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
EXTRA_DIST = \
@PACKAGE_NAME pc in \
GExiv2.py \
- @PACKAGE_NAME@.vapi \
gexiv2/gexiv2-version.m4 \
$(TYPELIB_FILES) \
test/data/sample-author-badencoding.jpg \
@@ -74,24 +75,24 @@ py3gi_DATA = GExiv2.py
endif
endif
+if ENABLE_VAPIGEN
vapi: gexiv2.vapi
-if ENABLE_VAPIGEN
gexiv2_vapi.stamp: $(top_builddir)/GExiv2-0.10.gir $(abs_top_srcdir)/vapi/GExiv2-0.10.metadata
$(abs_top_srcdir)/vapi/gexiv2-custom.vala
rm -f $(@F)
$(AM_V_GEN)$(VAPIGEN) --metadatadir=$(abs_top_srcdir)/vapi \
--library=gexiv2 \
$(top_builddir)/GExiv2-0.10.gir $(abs_top_srcdir)/vapi/gexiv2-custom.vala
echo timestmap > $(@F)
-endif
gexiv2.vapi: gexiv2_vapi.stamp
@true
-CLEANFILES = gexiv2.vapi gexiv2_vapi.stamp
+CLEANFILES += gexiv2.vapi gexiv2_vapi.stamp
dist_vapi_DATA = gexiv2.vapi
EXTRA_DIST += $(top_srcdir)/vapi/GExiv2-0.10.metadata gexiv2.vapi gexiv2_vapi.stamp
$(top_srcdir)/vapi/gexiv2-custom.vala
+endif
GEXIV2_GIRHEADERS = \
$(srcdir)/gexiv2/gexiv2.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]