summaryrefslogtreecommitdiff
path: root/ui/Makefile.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
commitcd16e7b4a394b6ce885a618d8a96eccd662208bb (patch)
treec9bcd713dbea9467783f8d82c63218af91192da1 /ui/Makefile.in
parentb1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff)
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'ui/Makefile.in')
-rw-r--r--ui/Makefile.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 3ec2b7c..2e3b7c5 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -106,7 +106,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
$(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_ui_DATA) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \
+ $(dist_ui_DATA) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -158,7 +159,7 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(uidir)"
-DATA = $(dist_ui_DATA)
+DATA = $(dist_noinst_DATA) $(dist_ui_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -354,16 +355,18 @@ dist_ui_DATA = \
savedsearch.ui \
search_bar.ui \
search_sidebar_context.ui \
- set_background_dialog.ui \
- set_background_slideshow_dialog.ui \
shotwell.ui \
- shotwell.xml \
sidebar_default_context.ui \
tag_sidebar_context.ui \
tags.ui \
top.ui \
trash.ui
+dist_noinst_DATA = \
+ appmenu.ui \
+ set_background_dialog.ui \
+ set_background_slideshow_dialog.ui
+
all: all-am
.SUFFIXES: