[libgd] Fix srcdir != builddir build
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgd] Fix srcdir != builddir build
- Date: Wed, 2 Jan 2013 17:20:13 +0000 (UTC)
commit 680a9f72a0c3019cf4013ed026270ee7b9f1abc9
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Wed Jan 2 01:37:16 2013 +0100
Fix srcdir != builddir build
Generated files go in $(builddir), not $(srcdir)
https://bugzilla.gnome.org/show_bug.cgi?id=690972
Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b44e8d1..d241eaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,9 +141,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 += $(builddir)/Gd-1.0.gir
+MAINTAINERCLEANFILES += $(builddir)/Gd-1.0.gir
else
girdir= $(pkgdatadir)/gir-1.0
typelibdir= $(pkglibdir)/girepository-1.0
@@ -158,10 +157,11 @@ endif
if LIBGD_VAPI
VAPIS = $(srcdir)/gd-1.0.vapi
-$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir
+$(srcdir)/gd-1.0.vapi: $(builddir)/Gd-1.0.gir
$(AM_V_GEN)$(VAPIGEN) \
--library gd-1.0 \
--pkg gtk+-3.0 \
+ -d $(srcdir) \
$<
#This 'touch' is a workaround for vapigen not touching the dest file if
#its content hasn't changed, which causes the rule to generate the .vapi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]