[recipes] Fix distcheck

[Matthias Clasen <matthiasc src gnome org>]

commit f5f47b5a753e1a808f86585e6d6255014704c043
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 15 16:08:48 2016 -0500

    Fix distcheck
    
    When generating files in subdirectories, we need to create the
    build-subdir first.

 Makefile.am       |    2 ++
 data/Makefile.am  |   21 +++++++++++----------
 src/Makefile.am   |   11 +++++++----
 tests/Makefile.am |   14 ++++++++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 44ef5ef..56de94f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = . libgd data src po tests
 
 EXTRA_DIST = AUTHORS NEWS
 
+CLEANFILES = AUTHORS NEWS
+
 AUTHORS:
        $(AM_V_GEN)if test -d "$(srcdir)/.git"; \
        then \
diff --git a/data/Makefile.am b/data/Makefile.am
index 377148b..72cd8b3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,17 +6,17 @@ desktopdir = $(datadir)/applications
 
 desktop_in_files = org.gnome.Recipes.desktop.in
 
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in
-       msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
+       $(AM_V_GEN) msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
 
 EXTRA_DIST += $(desktop_in_files)
 
 ingredientsdir = $(pkgdatadir)/ingredients
 imagesdir = $(pkgdatadir)/images
 
-ingredients_DATA = \
+dist_ingredients_DATA = \
        ingredients/Almond.png          \
        ingredients/Amaretti.png        \
        ingredients/Anchovis.png        \
@@ -32,7 +32,7 @@ ingredients_DATA = \
        ingredients/Biscotti.png        \
        ingredients/Carrot.png
 
-images_DATA = \
+dist_images_DATA = \
        images/alex.png                 \
        images/bagel.jpg                \
        images/Bastian.jpg              \
@@ -51,7 +51,7 @@ images_DATA = \
        images/tofuscramble.jpg         \
        images/wholesale-crackers.jpg
 
-pkgdata_DATA = \
+dist_pkgdata_DATA = \
        chefs.db        \
        picks.db        \
        recipes.db
@@ -102,7 +102,6 @@ update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
 
 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
-       touch libcheese_la_vala.stamp
 
 install-update-icon-cache:
        $(AM_V_at)$(POST_INSTALL)
@@ -114,10 +113,12 @@ uninstall-update-icon-cache:
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.Recipes.service.in
-service_DATA = $(service_in_files:.service.in=.service)
+dist_service_DATA = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-       @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+       $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+EXTRA_DIST += $(service_in_files)
 
 GITIGNOREFILES = $(service_DATA)
 
@@ -125,9 +126,9 @@ appdatadir = $(datadir)/appdata
 
 appdata_in_files = appdata/org.gnome.Recipes.appdata.xml.in
 
-appdata_DATA = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+dist_appdata_DATA = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
 
 %.appdata.xml: %.appdata.xml.in
-       msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
+       $(AM_V_GEN) mkdir appdata; msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
 
 EXTRA_DIST += $(appdata_in_files)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ee2fc3..c342044 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,12 +143,15 @@ gr-shell-search-provider-dbus.h gr-shell-search-provider-dbus.c: Makefile.am $(s
                $(srcdir)/shell-search-provider-dbus-interfaces.xml
 
 searchproviderdir = $(datadir)/gnome-shell/search-providers
-searchprovider_DATA = org.gnome.Recipes-search-provider.ini
+dist_searchprovider_DATA = org.gnome.Recipes-search-provider.ini
 
 EXTRA_DIST = \
-       $(resource_ui_files)    \
-       $(resource_image_files) \
-       types.h.template        \
+       shell-search-provider-dbus-interfaces.xml       \
+       recipes-ui.gresource.xml                        \
+       recipes-images.gresource.xml                    \
+       $(resource_ui_files)                            \
+       $(resource_image_files)                         \
+       types.h.template                                \
        types.c.template
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e7144c..9c6c0a7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,10 @@
+TESTS_ENVIRONMENT = \
+       G_TEST_SRCDIR="$(abs_srcdir)"           \
+       G_TEST_BUILDDIR="$(abs_builddir)"       \
+       G_DEBUG=gc-friendly                     \
+       MALLOC_CHECK_=2                         \
+       MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+
 TESTS = ingredients
 
 check_PROGRAMS = ingredients
@@ -10,4 +17,11 @@ ingredients_CFLAGS = \
 
 ingredients_LDADD = $(RECIPES_LIBS)
 
+EXTRA_DIST = \
+       data/valid-1.expected data/valid-1.in   \
+       data/valid-2.expected data/valid-2.in   \
+       data/valid-3.expected data/valid-3.in   \
+       data/valid-4.expected data/valid-4.in   \
+       data/valid-5.expected data/valid-5.in
+
 -include $(top_srcdir)/git.mk