diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
| commit | cd16e7b4a394b6ce885a618d8a96eccd662208bb (patch) | |
| tree | c9bcd713dbea9467783f8d82c63218af91192da1 /shotwell.am | |
| parent | b1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff) | |
| parent | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff) | |
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'shotwell.am')
| -rw-r--r-- | shotwell.am | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/shotwell.am b/shotwell.am index 1422009..bb2c53b 100644 --- a/shotwell.am +++ b/shotwell.am @@ -17,24 +17,23 @@ shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \ --pkg libgphoto2 --pkg posix --pkg libraw --pkg gexiv2 \ --pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \ --pkg gstreamer-pbutils-1.0 --pkg misc \ + --gresources $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml \ $(UNITY_VALAFLAGS) \ $(COMMON_VALAFLAGS_POST) -dist_noinst_DATA += src/org.gnome.Shotwell.gresource.xml +dist_noinst_DATA += org.gnome.Shotwell.gresource.xml nodist_shotwell_SOURCES = \ - src/resource.c -MOSTLYCLEANFILES += src/resource.c + resource.c +MOSTLYCLEANFILES += resource.c -shotwell_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) \ - --sourcedir=$(abs_top_srcdir)/icons \ - --sourcedir=$(abs_top_srcdir)/ui \ - --generate-dependencies $(abs_top_srcdir)/src/org.gnome.Shotwell.gresource.xml) +shotwell_resource_deps := $(shell $(GLIB_COMPILE_RESOURCES) \ + --sourcedir=$(abs_top_srcdir) \ + --generate-dependencies $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml) -src/resource.c: src/org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps) +resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \ - --sourcedir=$(abs_top_srcdir)/icons \ - --sourcedir=$(abs_top_srcdir)/ui \ + --sourcedir=$(abs_top_srcdir) \ --generate $< shotwell_SOURCES = \ |