[gupnp-dlna/wip/new-api: 43/48] Fix some builddir!=srcdir and make distcheck issues.

[Jens Georg <jensgeorg src gnome org>]

commit 0f677a9e4d84d3223e08a908d4f6089b769af160
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Mon Jan 7 14:31:56 2013 +0100

    Fix some builddir!=srcdir and make distcheck issues.

 Makefile.am                        |    2 +-
 libgupnp-dlna/Makefile.am          |   10 ++++++++--
 libgupnp-dlna/gupnp-dlna-profile.c |    1 +
 tests/Makefile.am                  |    1 +
 tools/Makefile.am                  |    3 +--
 vala/Makefile.am                   |    3 +++
 6 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 800f031..17b6d6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ dist-hook:
 		echo Creating ChangeLog && \
 		( cd "$(top_srcdir)" && \
 		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		  $(top_srcdir)/build-aux missing --run git log --stat ) > ChangeLog.tmp \
 		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
 		|| ( rm -f ChangeLog.tmp ; \
 		     echo Failed to generate ChangeLog >&2 ); \
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 580c4fa..13b8ae2 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -37,7 +37,8 @@ metadata_log_cflags = \
 
 common_cflags = \
 	$(GLIB_CFLAGS) \
-	$(GOBJECT_CFLAGS)
+	$(GOBJECT_CFLAGS) \
+	-I$(top_srcdir)
 
 metadata_cflags = \
 	-I$(top_srcdir)/libgupnp-dlna/metadata
@@ -164,7 +165,8 @@ dist_noinst_HEADERS += \
 	gupnp-dlna-value-type.h \
 	gupnp-dlna-info-value.h \
 	gupnp-dlna-value.h \
-	gupnp-dlna-info-set.h
+	gupnp-dlna-info-set.h \
+	gupnp-dlna-profile-private.h
 
 
 # INTROSPECTION
@@ -209,6 +211,8 @@ GUPnPDLNA_2_0_gir_INCLUDES = GObject-2.0
 GUPnPDLNA_2_0_gir_SCANNERFLAGS = \
 	--symbol-prefix=gupnp_dlna \
 	--identifier-prefix=GUPnPDLNA
+GUPnPDLNA_2_0_gir_CFLAGS = \
+	-I$(top_srcdir)
 
 if GSTREAMER_METADATA_BACKEND_ENABLED
 girs += GUPnPDLNAGst-2.0.gir
@@ -225,6 +229,8 @@ GUPnPDLNAGst_2_0_gir_SCANNERFLAGS = \
 	--symbol-prefix=gupnp_dlna_gst \
 	--identifier-prefix=GUPnPDLNAGst \
 	--add-include-path=.
+GUPnPDLNAGst_2_0_gir_CFLAGS = \
+	-I$(top_srcdir)
 endif
 
 INTROSPECTION_GIRS += $(girs)
diff --git a/libgupnp-dlna/gupnp-dlna-profile.c b/libgupnp-dlna/gupnp-dlna-profile.c
index 65591bc..ac338ae 100644
--- a/libgupnp-dlna/gupnp-dlna-profile.c
+++ b/libgupnp-dlna/gupnp-dlna-profile.c
@@ -22,6 +22,7 @@
  */
 
 #include "gupnp-dlna-profile.h"
+#include "gupnp-dlna-profile-private.h"
 
 /**
  * SECTION:gupnp-dlna-profile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index da77f98..a916937 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,7 @@ sets_CFLAGS = \
 	$(GOBJECT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(GMODULE_CFLAGS) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/libgupnp-dlna \
 	-I$(top_srcdir)/libgupnp-dlna/profile-backends/native \
 	-I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets
diff --git a/tools/Makefile.am b/tools/Makefile.am
index aa4c515..959bee1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,8 +7,7 @@ AM_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(GMODULE_CFLAGS) \
-	-I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets
+	$(GMODULE_CFLAGS)
 LIBS = \
 	$(GLIB_LIBS) \
 	$(GOBJECT_LIBS) \
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 3fcb8dd..8100b8a 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -36,6 +36,9 @@ gupnp-dlna-gst-2.0.stamp: $(builddir)/../libgupnp-dlna/GUPnPDLNAGst-2.0.gir \
 			      --library=gupnp-dlna-gst-2.0 \
 			      --vapidir=$(builddir) \
 			      --girdir=$(builddir)/../libgupnp-dlna \
+			      --pkg gupnp-dlna-2.0 \
+			      --pkg gstreamer-1.0 \
+			      --pkg gstreamer-pbutils-1.0 \
 			      $(builddir)/../libgupnp-dlna/GUPnPDLNAGst-2.0.gir \
 			      $(srcdir)/gupnp-dlna-gst-2.0-custom.vala && \
 	echo timestamp > $(@F)