Commit a63bdc12 authored by Jens Georg's avatar Jens Georg

build: Fix building of introspection data

Signed-off-by: 's avatarJens Georg <mail@jensge.org>
parent 5b2d71e5
...@@ -63,6 +63,8 @@ dist_gir_DATA = $(GIRS) ...@@ -63,6 +63,8 @@ dist_gir_DATA = $(GIRS)
typelibdir = $(libdir)/girepository-1.0 typelibdir = $(libdir)/girepository-1.0
nodist_typelib_DATA = $(GIRS:.gir=.typelib) nodist_typelib_DATA = $(GIRS:.gir=.typelib)
DISTCLEANFILES = RygelCore-2.4.typelib
MAINTAINERCLEANFILES += $(BUILT_SOURCES) MAINTAINERCLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = \ EXTRA_DIST = \
...@@ -71,4 +73,5 @@ EXTRA_DIST = \ ...@@ -71,4 +73,5 @@ EXTRA_DIST = \
$(DEPS_FILES) \ $(DEPS_FILES) \
uuid.vapi \ uuid.vapi \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
RygelCore-2.4.gir RygelCore-2.4.gir \
Rygel-2.4.gir
...@@ -36,7 +36,7 @@ rygel-renderer.h rygel-renderer-2.4.vapi Rygel-2.4.gir: librygel_renderer_2_4_la ...@@ -36,7 +36,7 @@ rygel-renderer.h rygel-renderer-2.4.vapi Rygel-2.4.gir: librygel_renderer_2_4_la
-include $(INTROSPECTION_MAKEFILE) -include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS= INTROSPECTION_GIRS=
INTROSPECTION_SCANNER_ARGS= INTROSPECTION_SCANNER_ARGS=
INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core --includedir=$(srcdir)/../librygel-core
$(builddir)/RygelRenderer-2.4.gir: $(srcdir)/Rygel-2.4.gir $(builddir)/RygelRenderer-2.4.gir: $(srcdir)/Rygel-2.4.gir
$(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelRenderer.,g' \ $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelRenderer.,g' \
-e 's,namespace name="Rygel",namespace name="RygelRenderer",g' \ -e 's,namespace name="Rygel",namespace name="RygelRenderer",g' \
...@@ -53,5 +53,5 @@ typelibdir = $(libdir)/girepository-1.0 ...@@ -53,5 +53,5 @@ typelibdir = $(libdir)/girepository-1.0
nodist_typelib_DATA = $(GIRS:.gir=.typelib) nodist_typelib_DATA = $(GIRS:.gir=.typelib)
DISTCLEANFILES = RygelRenderer-2.4.typelib
EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir Rygel-2.4.gir
...@@ -40,7 +40,7 @@ rygel-server.h rygel-server-2.4.vapi Rygel-2.4.gir: librygel_server_2_4_la_vala. ...@@ -40,7 +40,7 @@ rygel-server.h rygel-server-2.4.vapi Rygel-2.4.gir: librygel_server_2_4_la_vala.
-include $(INTROSPECTION_MAKEFILE) -include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS= INTROSPECTION_GIRS=
INTROSPECTION_SCANNER_ARGS= INTROSPECTION_SCANNER_ARGS=
INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core --includedir=$(srcdir)/../librygel-core
$(builddir)/RygelServer-2.4.gir: $(srcdir)/Rygel-2.4.gir $(builddir)/RygelServer-2.4.gir: $(srcdir)/Rygel-2.4.gir
$(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelServer.,g' \ $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelServer.,g' \
-e 's,namespace name="Rygel",namespace name="RygelServer",g' \ -e 's,namespace name="Rygel",namespace name="RygelServer",g' \
...@@ -56,5 +56,5 @@ dist_gir_DATA = $(GIRS) ...@@ -56,5 +56,5 @@ dist_gir_DATA = $(GIRS)
typelibdir = $(libdir)/girepository-1.0 typelibdir = $(libdir)/girepository-1.0
nodist_typelib_DATA = $(GIRS:.gir=.typelib) nodist_typelib_DATA = $(GIRS:.gir=.typelib)
DISTCLEANFILES = RygelServer-2.4.typelib
EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir Rygel-2.4.gir
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment