From b0b0c977a974920859fe6c9225e5d1a1e6c79f94 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 16 Apr 2009 19:54:09 +0300 Subject: [PATCH] dbus service: use builddir when referring to dbus interface file --- src/Makefile-gen.am | 2 +- syncevo-dbus/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile-gen.am b/src/Makefile-gen.am index 1ec16ee6..5e5a1d37 100644 --- a/src/Makefile-gen.am +++ b/src/Makefile-gen.am @@ -132,7 +132,7 @@ syncevo_dbus_server_DEPENDENCIES = $(EXTRA_LTLIBRARIES) $(CORE_DEP) $(SYNTHESIS_ syncevo-dbus-glue.h: stamp-syncevo-dbus-glue.h @true -stamp-syncevo-dbus-glue.h: $(srcdir)/../interfaces/syncevo.xml +stamp-syncevo-dbus-glue.h: $(builddir)/../interfaces/syncevo.xml $(DBUS_BINDING_TOOL) --prefix=syncevo --mode=glib-server $< > xgen-$(@F) \ && (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \ && rm -f xgen-$(@F) \ diff --git a/syncevo-dbus/Makefile.am b/syncevo-dbus/Makefile.am index a16be699..3f2f2399 100644 --- a/syncevo-dbus/Makefile.am +++ b/syncevo-dbus/Makefile.am @@ -42,14 +42,14 @@ CLEANFILES = $(BUILT_SOURCES) %-bindings.h: stamp-%-bindings.h @true -stamp-%-bindings.h: ../interfaces/%.xml +stamp-%-bindings.h: $(builddir)/../interfaces/%.xml $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=syncevo $< > xgen-$(@F) \ && (cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%)) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) -syncevo-marshal.h: ../interfaces/syncevo-marshal.list $(GLIB_GENMARSHAL) +syncevo-marshal.h: $(srcdir)/../interfaces/syncevo-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --header --prefix=syncevo_marshal > $@ -syncevo-marshal.c: ../interfaces/syncevo-marshal.list syncevo-marshal.h $(GLIB_GENMARSHAL) +syncevo-marshal.c: $(srcdir)/../interfaces/syncevo-marshal.list syncevo-marshal.h $(GLIB_GENMARSHAL) echo "#include \"syncevo-marshal.h\"" > $@ \ && $(GLIB_GENMARSHAL) --prefix=syncevo_marshal $(srcdir)/../interfaces/syncevo-marshal.list --body >> $@