[libdmapsharing/LIBDMAPSHARING_3_0] Backport form 4.0 series: fix some autotools warnings

[W. Michael Petullo <wmpetullo src gnome org>]

commit 895205fecdb99b6b9f8065213b50e8f99a070852
Author: W. Michael Petullo <mike flyn org>
Date:   Tue Jun 30 14:46:49 2020 -0400

    Backport form 4.0 series: fix some autotools warnings

 libdmapsharing/Makefile.am |  2 +-
 tests/Makefile.am          | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index 9519f07..822615e 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -150,7 +150,7 @@ dmap-enums.h: $(libdmapsharinginclude_HEADERS) Makefile
        && sed -e "s/d_map/dmap/" -e "s/D_MAP/DMAP/" -e "s/d_acp/dacp/" -e "s/D_ACP/DACP/" $@.tmp > $@ \
        && rm -f $@.tmp
 
-unit-test.stamp: $(grep -l START_TEST *.c)
+unit-test.stamp: *.c
        ./generate-test-suites
        mv unit-test.c ../tests
        touch unit-test.stamp
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 08b0b0e..a32143f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,7 +7,7 @@ endif
 
 # Automake documentation mentions LDADD, but it does not work;
 # LIBS does.
-LIBS = $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la
+LIBS += $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la
 
 if HAVE_CHECK
 noinst_PROGRAMS += unit-test
@@ -129,18 +129,16 @@ unit_test_LDADD = \
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
+       $(GDKPIXBUF_CFLAGS) \
+       $(GEE_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
-       $(GSTREAMERAPP_CFLAGS) \
        $(GOBJECT_CFLAGS) \
-       $(GDKPIXBUF_CFLAGS) \
-       $(SOUP_CFLAGS) \
-       $(MDNS_CFLAGS)
-
-INCLUDES = \
-       $(IMAGEMAGICK_CFLAGS) \
+       $(GSTREAMERAPP_CFLAGS) \
+       $(GTHREAD_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(GEE_CFLAGS)
+       $(IMAGEMAGICK_CFLAGS) \
+       $(MDNS_CFLAGS) \
+       $(SOUP_CFLAGS)
 
 noinst_HEADERS = \
        test-dmap-container-record.h \