diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-01 17:48:00 +0800 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-01 18:23:45 +0800 |
| commit | 41d2d42c2461e9577f4b8802828e505bf49d1f32 (patch) | |
| tree | e1a2ebd83a95c8b7bc3165c77c8b6ea0e28bb1cd | |
| parent | 15460fa9ae4e6a19e8b6e971014deb50746d90ee (diff) | |
| download | gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar.gz gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar.bz2 gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar.lz gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar.xz gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.tar.zst gsoc2013-empathy-41d2d42c2461e9577f4b8802828e505bf49d1f32.zip | |
chat-resources: Fix dependencies generation on $(srcdir) != $(builddir)
`glib-compile-resources generate-dependencies' needs the --sourcedir
flag to be able to work properly when $(srcdir) != $(builddir).
Spotted by running `make distcheck'.
| -rw-r--r-- | src/Makefile.am | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0766d9580..db30af3f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 $< |