[libdmapsharing] Small changes to libdmapsharing/Makefile.am

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

commit 3311548742b1159ce9ff5bcb03bcbab97d74d961
Author: W. Michael Petullo <mike flyn org>
Date:   Mon Oct 23 15:52:17 2017 -0400

    Small changes to libdmapsharing/Makefile.am
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/Makefile.am       |   17 ++++++++++-------
 libdmapsharing/dacp-share.c      |    6 +++---
 libdmapsharing/dmap-connection.c |    4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index 8770b1d..298dccb 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -1,17 +1,18 @@
 lib_LTLIBRARIES = libdmapsharing-3.0.la
 
 libdmapsharing_3_0_la_SOURCES = \
-       $(BUILT_SOURCES) \
        daap-connection.c \
        daap-record.c \
        daap-share.c \
        dacp-connection.c \
-       dacp-share.c \
        dacp-player.c \
+       dacp-share.c \
        dmap-connection.c \
        dmap-container-db.c \
        dmap-container-record.c \
        dmap-db.c \
+       dmap-enums.c \
+       dmap-marshal.c \
        dmap-md5.c \
        dmap-private-utils.c \
        dmap-record.c \
@@ -112,10 +113,10 @@ BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h unit-tes
 CLEANFILES = $(BUILT_SOURCES) ../tests/unit-test.c *-suite.c
 
 dmap-marshal.c: dmap-marshal.list
-       @glib-genmarshal --prefix=dmap_marshal $(srcdir)/dmap-marshal.list --header --body > dmap-marshal.c
+       @glib-genmarshal --prefix=dmap_marshal_generated $(srcdir)/dmap-marshal.list --body > dmap-marshal.c
 
 dmap-marshal.h: dmap-marshal.list
-       @glib-genmarshal --prefix=dmap_marshal $(srcdir)/dmap-marshal.list --header > dmap-marshal.h
+       @glib-genmarshal --prefix=dmap_marshal_generated $(srcdir)/dmap-marshal.list --header > dmap-marshal.h
 
 dmap-enums.c: $(libdmapsharinginclude_headers) Makefile dmap-enums.h
        @glib-mkenums \
@@ -171,10 +172,12 @@ endif
 
 check:
 if HAVE_PEDANSEE
-       set -e; for i in $(libdmapsharing_3_0_la_SOURCES) \
-                        $(libdmapsharinginclude_HEADERS) \
+       set -e; for i in $(libdmapsharing_3_0_la_SOURCES); do \
+               $(PEDANSEE) $(DEFS) $(libdmapsharing_3_0_la_CFLAGS) $$i; \
+       done
+       set -e; for i in $(libdmapsharinginclude_HEADERS) \
                         $(noinst_HEADERS); do \
-               $(PEDANSEE) $(libdmapsharing_3_0_la_CFLAGS) $$i; \
+               $(PEDANSEE) $(DEFS) $(libdmapsharing_3_0_la_CFLAGS) $$i; \
        done
 endif
 
diff --git a/libdmapsharing/dacp-share.c b/libdmapsharing/dacp-share.c
index 4704724..e3db606 100644
--- a/libdmapsharing/dacp-share.c
+++ b/libdmapsharing/dacp-share.c
@@ -172,7 +172,7 @@ dacp_share_class_init (DACPShareClass * klass)
                              G_STRUCT_OFFSET (DACPShareClass, remote_found),
                              NULL,
                              NULL,
-                             dmap_marshal_VOID__STRING_STRING,
+                             dmap_marshal_generated_VOID__STRING_STRING,
                              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
        /**
@@ -207,7 +207,7 @@ dacp_share_class_init (DACPShareClass * klass)
                              G_STRUCT_OFFSET (DACPShareClass, remote_paired),
                              NULL,
                              NULL,
-                             dmap_marshal_VOID__STRING_BOOLEAN,
+                             dmap_marshal_generated_VOID__STRING_BOOLEAN,
                              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
        /**
@@ -226,7 +226,7 @@ dacp_share_class_init (DACPShareClass * klass)
                              G_STRUCT_OFFSET (DACPShareClass, lookup_guid),
                              NULL,
                              NULL,
-                             dmap_marshal_BOOLEAN__STRING,
+                             dmap_marshal_generated_BOOLEAN__STRING,
                              G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
 
        /**
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 3bc749a..cec5b4b 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -262,7 +262,7 @@ dmap_connection_class_init (DMAPConnectionClass * klass)
                                              G_STRUCT_OFFSET
                                              (DMAPConnectionClass,
                                               authenticate), NULL, NULL,
-                                             dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN,
+                                             
dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN,
                                              G_TYPE_NONE, 5,
                                              G_TYPE_STRING,
                                              SOUP_TYPE_SESSION,
@@ -274,7 +274,7 @@ dmap_connection_class_init (DMAPConnectionClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DMAPConnectionClass,
                                               connecting), NULL, NULL,
-                             dmap_marshal_VOID__ULONG_FLOAT, G_TYPE_NONE, 2,
+                             dmap_marshal_generated_VOID__ULONG_FLOAT, G_TYPE_NONE, 2,
                              G_TYPE_ULONG, G_TYPE_FLOAT);
        signals[CONNECTED] =
                g_signal_new ("connected", G_TYPE_FROM_CLASS (object_class),