X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=extensions%2FMakefile.am;h=79622d48a1231161035a39c6b9d0696b14b6efe6;hp=834fa6e87b396d011130ebce25a025d3a32dec1f;hb=db7fe679424ee59189b7fbc03a8c5299eaf14baa;hpb=73ec31d004ca3a84884d9550ce78d2311fadac50

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 834fa6e8..79622d48 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,18 +1,20 @@
 tools_dir = $(top_srcdir)/tools
 
+AM_CPPFLAGS = $(DISABLE_DEPRECATED)
+
 AM_CFLAGS = \
     -I$(top_srcdir) \
     -I$(top_builddir) \
     $(WARN_CFLAGS) \
-    $(LIBEMPATHY_CFLAGS)
+    $(EMPATHY_CFLAGS)
 
 EXTRA_DIST = \
     all.xml \
+    generic-types.xml \
     misc.xml \
-    Channel_Handler.xml \
-    Stream_Engine.xml \
-    Tube_Handler.xml \
-    Channel_Type_File.xml
+    Logger.xml \
+    Channel_Interface_Credentials_Storage.xml \
+    $(NULL)
 
 noinst_LTLIBRARIES = libemp-extensions.la
 
@@ -28,9 +30,6 @@ libemp_extensions_la_SOURCES = \
     extensions.h
 
 nodist_libemp_extensions_la_SOURCES = \
-    _gen/signals-marshal.c \
-    _gen/signals-marshal.h \
-    _gen/signals-marshal.list \
     _gen/register-dbus-glib-marshallers-body.h \
     _gen/enums.h \
     _gen/gtypes.h \
@@ -50,90 +49,80 @@ BUILT_SOURCES = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
+clean-local:
+	rm -rf _gen
+
 XSLTPROCFLAGS = --nonet --novalid
 
 # Generated files which can be generated for all categories simultaneously
 
-_gen/all.xml: all.xml $(wildcard *.xml)
-	$(mkdir_p) _gen
-	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
-		--param "allow-undefined-interfaces" "true()" \
-		$< > $@
+_gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
+	@$(MKDIR_P) _gen
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+		--param "allow-undefined-interfaces" "true()" \
 		$(tools_dir)/doc-generator.xsl \
 		$< > $@
 
 _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
 	$(top_srcdir)/tools/glib-gtypes-generator.py
-	$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
 		$< _gen/gtypes Emp
 
-_gen/signals-marshal.list: _gen/all.xml \
-	$(tools_dir)/glib-signals-marshal-gen.py
-	$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
-
-_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@
-
-_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
-	{ echo '#include "_gen/signals-marshal.h"' && \
-	$(GLIB_GENMARSHAL) --body --prefix=_emp_ext_marshal $< ; } > $@
-
 _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
-	$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
 		_emp_ext > $@
 
-_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
-		--stringparam mixed-case-prefix Emp \
-		$(tools_dir)/c-constants-generator.xsl \
-		$< > $@
-
-_gen/interfaces.h: _gen/all.xml \
-	$(tools_dir)/glib-interfaces-generator.xsl \
-	$(tools_dir)/c-interfaces-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
-		--stringparam mixed-case-prefix Emp \
-		$(tools_dir)/glib-interfaces-generator.xsl \
-		$< > $@
+_gen/enums.h: _gen/all.xml \
+	$(tools_dir)/c-constants-gen.py
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \
+		Emp \
+		$< _gen/enums
 
-_gen/interfaces-body.h: _gen/all.xml \
-	$(tools_dir)/glib-interfaces-body-generator.xsl \
-	$(tools_dir)/c-interfaces-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
-		--stringparam mixed-case-prefix Emp \
-		$(tools_dir)/glib-interfaces-body-generator.xsl \
-		$< > $@
+_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
+	$(tools_dir)/glib-interfaces-gen.py
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+		Emp _gen/interfaces-body.h _gen/interfaces.h $<
 
 # Generated files which must be generated per "category". Each TpProxy
 # subclass you want to use with --subclass will need to have its own category,
 # although you can subdivide further if you want.
 
-_gen/misc.xml: misc.xml $(wildcard *.xml)
-	$(mkdir_p) _gen
-	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
-		$< > $@
+_gen/misc.xml: misc.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
+	@$(MKDIR_P) _gen
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
+
+_gen/cli-misc-body.h: _gen/cli-misc.h
 
-_gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \
+_gen/cli-misc.h: _gen/misc.xml \
 	$(tools_dir)/glib-client-gen.py
-	$(PYTHON) $(tools_dir)/glib-client-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=misc \
 		--subclass=TpProxy \
 		--subclass-assert=TP_IS_PROXY \
 		--iface-quark-prefix=EMP_IFACE_QUARK \
-		--tp-proxy-api=0.7.6 \
+		--tp-proxy-api=0.10.0 \
 		$< Emp_Cli _gen/cli-misc
 
-_gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml \
+# There is no need to execute glib-ginterface-gen.py twice because it
+# generates both the .c and .h files in one shot. Therefore, merely
+# having one of them (say the .c) depend on the other (say the .h) is
+# enough.
+#
+# Moreover, running it twice breaks parallel builds because one
+# glib-ginterface-gen.py process steps on the other.
+
+_gen/svc-misc.c: _gen/svc-misc.h
+
+_gen/svc-misc.h: _gen/misc.xml \
 	$(tools_dir)/glib-ginterface-gen.py
-	$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc-misc \
 		--signal-marshal-prefix=_emp_ext \
-		--include='<telepathy-glib/dbus.h>' \
-		--include='"_gen/signals-marshal.h"' \
+		--include='<telepathy-glib/telepathy-glib.h>' \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
 		--allow-unstable \
 		$< Emp_Svc_