]> git.0d.be Git - empathy.git/commitdiff
chat-resources: Fix dependencies generation on $(srcdir) != $(builddir)
authorEmanuele Aina <emanuele.aina@collabora.com>
Mon, 1 Apr 2013 09:48:00 +0000 (11:48 +0200)
committerEmanuele Aina <emanuele.aina@collabora.com>
Mon, 1 Apr 2013 10:23:45 +0000 (12:23 +0200)
`glib-compile-resources generate-dependencies' needs the --sourcedir
flag to be able to work properly when $(srcdir) != $(builddir).
Spotted by running `make distcheck'.

src/Makefile.am

index 0766d95807dc857c32349c004c1800cba10dd9f7..db30af3f2cccf0b45e3bf11f5cc640ff923ae64f 100644 (file)
@@ -207,14 +207,10 @@ BUILT_SOURCES = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
-               --sourcedir=$(srcdir) \
-               --generate-source \
-               $<
-
-empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
-               --sourcedir=$(srcdir) \
-               --generate-header \
-               $<
+chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files)
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files)
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<