[gupnp-tools] all: Fix distcheck

[Jens Georg <jensgeorg src gnome org>]

commit 67d5d2ffb7bfa6606168cfa5d20a5428e8a84373
Author: Jens Georg <mail jensge org>
Date:   Sat Sep 9 13:05:04 2017 +0200

    all: Fix distcheck

 data/Makefile.am      |   22 ++++++++++++++++------
 src/av-cp/Makefile.am |   12 +++++++-----
 2 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 53248a7..a0ef31b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,15 +2,16 @@ SUBDIRS = pixmaps xml
 
 shareddir = $(datadir)/gupnp-tools
 
-dist_shared_DATA = gupnp-universal-cp.ui \
-                  gupnp-network-light.ui
+dist_shared_DATA = \
+       gupnp-universal-cp.ui \
+       gupnp-network-light.ui
 
 desktopdir = ${datadir}/applications
-desktop_in_files = gupnp-universal-cp.desktop.in \
-                  gupnp-network-light.desktop.in
+desktop_in_files = \
+       gupnp-universal-cp.desktop.in \
+       gupnp-network-light.desktop.in
 
 if BUILD_AV
-dist_shared_DATA += gupnp-av-cp.ui search-dialog.ui didl-lite-dialog.ui
 desktop_in_files += gupnp-av-cp.desktop.in
 endif
 
@@ -25,7 +26,16 @@ desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in)
        $(AM_V_GEN) $(SED) -e 's|@VERSION[@]|$(VERSION)|g' \
                                        -e 's|@PKGDATADIR[@]|$(PKGDATADIR)|g' $< > $@
 
-EXTRA_DIST = $(desktop_in_in_files) didl-lite-dialog.ui.in $(desktop_in_files)
+EXTRA_DIST = \
+       $(desktop_in_in_files) \
+       didl-lite-dialog.ui.in \
+       gupnp-av-cp.ui \
+       search-dialog-context.ui \
+       search-dialog.ui \
+       didl-lite-dialog.ui.in \
+       $(desktop_in_files) \
+       org.gupnp.Tools.AV-CP.gresource.xml \
+       org.gupnp.Tools.Common.gresource.xml
 
 CLEANFILES = $(desktop_DATA)
 
diff --git a/src/av-cp/Makefile.am b/src/av-cp/Makefile.am
index 2982b5a..f2b738c 100644
--- a/src/av-cp/Makefile.am
+++ b/src/av-cp/Makefile.am
@@ -19,17 +19,19 @@ RESOURCEFILE = $(top_srcdir)/data/org.gupnp.Tools.AV-CP.gresource.xml
 
 resource_depends = \
        $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies \
-               --sourcedir=$(top_srcdir)/data \
+               --sourcedir=$(top_srcdir)/data --sourcedir=$(abs_top_builddir)/data \
                $(RESOURCEFILE))
 
 
+BUILT_SOURCES = resource.c
+CLEANFILES = resource.c
+nodist_gupnp_av_cp_SOURCES = resource.c
 
 resource.c: $(RESOURCEFILE) $(resource_depends)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate 
$(RESOURCEFILE)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/data 
--sourcedir=$(abs_top_builddir)/data --generate $(RESOURCEFILE)
 
 
 gupnp_av_cp_SOURCES = main.c \
-                     resource.c \
                      gui.c \
                      playlist-treeview.c \
                      renderer-combo.c \
@@ -60,8 +62,8 @@ if OS_WIN32
 av-cp.res: av-cp.rc
        $(WINDRES) -i av-cp.rc --input-format=rc -o av-cp.res -O coff
 gupnp_av_cp_LDADD += av-cp.res
-BUILT_SOURCES=av-cp.res
-CLEAN_FILES=av-cp.res
+BUILT_SOURCES += av-cp.res
+CLEANFILES += av-cp.res
 gupnp_av_cp_LDFLAGS += -Wl,-subsystem,windows
 endif