[libgd] Fix srcdir != builddir build, don't dist vapi and gir.
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgd] Fix srcdir != builddir build, don't dist vapi and gir.
- Date: Sat, 6 Oct 2018 16:46:08 +0000 (UTC)
commit dbfdc526f00025f5b439438c22361026494aded2
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Wed Jan 2 01:37:16 2013 +0100
Fix srcdir != builddir build, don't dist vapi and gir.
Generated files go in $(builddir), not $(srcdir).
(That was a trick to avoid requiring gir & vapi generation at build
time. But since libgd already requires vapigen & g-i at configure
time, it shouldn't be a problem to require them too at build-time)
https://bugzilla.gnome.org/show_bug.cgi?id=690972
Makefile.am | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5b7ded7..5a07144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,9 +199,8 @@ Gd_1_0_gir_INCLUDES = $(LIBGD_GIR_INCLUDES)
Gd_1_0_gir_FILES = $(nodist_libgd_la_SOURCES)
if LIBGD_STATIC
-noinst_DATA += $(srcdir)/Gd-1.0.gir
-EXTRA_DIST += $(srcdir)/Gd-1.0.gir
-MAINTAINERCLEANFILES += $(srcdir)/Gd-1.0.gir
+noinst_DATA += Gd-1.0.gir
+CLEANFILES += Gd-1.0.gir
else
girdir= $(pkgdatadir)/gir-1.0
typelibdir= $(pkglibdir)/girepository-1.0
@@ -214,9 +213,9 @@ endif
endif
if LIBGD_VAPI
-VAPIS = $(srcdir)/gd-1.0.vapi
+VAPIS = gd-1.0.vapi
-$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir
+gd-1.0.vapi: Gd-1.0.gir
$(AM_V_GEN)$(VAPIGEN) \
--library gd-1.0 \
--pkg gtk+-3.0 \
@@ -227,6 +226,5 @@ $(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir
@touch $@
noinst_DATA += $(VAPIS)
-EXTRA_DIST += $(VAPIS)
-MAINTAINERCLEANFILES += $(VAPIS)
+CLEANFILES += $(VAPIS)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]