GNOME.org
 

[grilo/0.1.x] Do not dist gir_DATA

commit 55f9b6212a0366b2575c4b46d01a6bfd32effd01
Author: Yaakov Selkowitz <yselkowitz users sourceforge net>
Date:   Sat Dec 10 22:54:42 2011 -0600

    Do not dist gir_DATA
    
    GIR files contain a shared-library attribute which varies per platform,
    and therefore must not be disted; see bug 621611 for rationale.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=665938
    
    Signed-off-by: Yaakov Selkowitz <yselkowitz users sourceforge net>
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 libs/net/Makefile.am |    4 +++-
 src/Makefile.am      |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
index 09cb551..f09deff 100644
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@@ -42,9 +42,11 @@ libgrlnet_ GRL_MAJORMINOR@include_HEADERS =	\
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
+	*.gir		\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
 CLEANFILES =
 
 # introspection support
@@ -68,7 +70,7 @@ GrlNet_ GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += GrlNet- GRL_MAJORMINOR@.gir
 
 girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c727f8..f38fe6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,9 +110,11 @@ EXTRA_DIST =				\
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
+	*.gir		\
 	*~
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
+
 CLEANFILES =
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -134,7 +136,7 @@ Grl_ GRL_MAJORMINOR_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sou
 INTROSPECTION_GIRS += Grl- GRL_MAJORMINOR@.gir
 
 girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]