[shotwell/wip/autotools] build: Fix dist tarball

[Jens Georg <jensgeorg src gnome org>]

commit afef2962eabd529a62532227983888b96e76257c
Author: Jens Georg <mail jensge org>
Date:   Fri Jul 1 23:44:14 2016 +0200

    build: Fix dist tarball

 Makefile.am       |   20 +++++++++++++++++---
 icons/Makefile.am |    2 +-
 import.am         |    2 +-
 misc/Makefile.am  |   10 +++++++++-
 publish-extra.am  |    2 +-
 publish.am        |    2 +-
 shotwell.am       |    3 ++-
 transition.am     |    2 +-
 ui/Makefile.am    |    3 ++-
 9 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c9fd960..e529a2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
 plugins_common_libshotwell_plugin_common_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
        -DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-       -I plugins
+       -I $(top_srcdir)/plugins -I$(top_builddir)/plugins
 
 plugins/shotwell-plugin-dev-1.0.vapi: src_plugins_libplugin_la_vala.stamp
 
@@ -100,10 +100,10 @@ SHOTWELL_PLUGIN_LDFLAGS = \
 
 plugindir = $(pkglibdir)/plugins/builtin
 plugin_LTLIBRARIES =
-plugin_DATA =
+dist_plugin_DATA =
 pkglibexec_PROGRAMS =
 
-pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
+dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
 
 include $(top_srcdir)/common.am
 include $(top_srcdir)/shotwell.am
@@ -114,3 +114,17 @@ include $(top_srcdir)/publish.am
 include $(top_srcdir)/publish-extra.am
 include $(top_srcdir)/transition.am
 include $(top_srcdir)/import.am
+
+dist_noinst_SCRIPTS = \
+       autogen.sh
+
+dist_noinst_DATA = \
+       plugins/shotwell-plugin-dev-1.0.h \
+       plugins/shotwell-plugin-common.h \
+       vapi/gphoto.h \
+       vapi/LConv.vapi \
+       vapi/libexif.vapi \
+       vapi/libgphoto2.vapi \
+       vapi/libraw.vapi \
+       vapi/unity.deps \
+       vapi/unity.vapi
diff --git a/icons/Makefile.am b/icons/Makefile.am
index bcdeea4..e0613da 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,6 +1,6 @@
 imagesdir = $(datadir)/shotwell/icons
 
-images_DATA = \
+dist_images_DATA = \
        all-rejected.png \
        crop-pivot-reticle.png \
        crop.svg \
diff --git a/import.am b/import.am
index 9753270..b0f55c8 100644
--- a/import.am
+++ b/import.am
@@ -1,5 +1,5 @@
 plugin_LTLIBRARIES += plugins/shotwell-data-imports/shotwell-data-imports.la
-plugin_DATA += plugins/shotwell-data-imports/f-spot-24.png
+dist_plugin_DATA += plugins/shotwell-data-imports/f-spot-24.png
 
 plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
        plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala \
diff --git a/misc/Makefile.am b/misc/Makefile.am
index d4b55ac..67533bf 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -7,7 +7,7 @@ appdata_XML = \
        shotwell.appdata.xml
 
 desktopdir = $(datadir)/applications
-desktop_in_files = $(srcdir)/shotwell.desktop.in $(srcdir)/shotwell-viewer.desktop.in
+desktop_in_files = shotwell.desktop.in shotwell-viewer.desktop.in
 desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 
 $(appdata_XML) : $(appdata_in_files)
@@ -22,3 +22,11 @@ $(desktop_DATA): $(desktop_in_files)
 
 @GSETTINGS_RULES@
 @APPDATA_XML_RULES@
+
+CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
+
+dist_noinst_DATA = \
+       $(srcdir)/shotwell.desktop.in.in \
+       $(srcdir)/shotwell-viewer.desktop.in.in \
+       $(gsettings_SCHEMAS) \
+       $(appdata_in_files)
diff --git a/publish-extra.am b/publish-extra.am
index d87bfbb..dee877f 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -1,5 +1,5 @@
 plugin_LTLIBRARIES += plugins/shotwell-publishing-extras/shotwell-publishing-extras.la
-plugin_DATA += \
+dist_plugin_DATA += \
        plugins/shotwell-publishing-extras/gallery3.png \
        plugins/shotwell-publishing-extras/rajce.png \
        plugins/shotwell-publishing-extras/tumblr.png \
diff --git a/publish.am b/publish.am
index 6b39ccc..8564a0a 100644
--- a/publish.am
+++ b/publish.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la
 
-plugin_DATA += \
+dist_plugin_DATA += \
        plugins/shotwell-publishing/facebook.png \
        plugins/shotwell-publishing/flickr.png \
        plugins/shotwell-publishing/picasa.png \
diff --git a/shotwell.am b/shotwell.am
index 7c5b5bf..1e9caa2 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -3,7 +3,8 @@ shotwell_CFLAGS = \
        $(SHOTWELL_CFLAGS) \
        $(UNITY_CFLAGS) \
        $(COMMON_CFLAGS) \
-       -Iplugins
+       -I$(top_builddir)/plugins \
+       -I$(top_srcdir)/plugins
 
 shotwell_LDADD = src/plugins/libplugin.la $(SHOTWELL_LIBS) $(UNITY_LIBS)
 shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
diff --git a/transition.am b/transition.am
index b635d2f..029b322 100644
--- a/transition.am
+++ b/transition.am
@@ -1,5 +1,5 @@
 plugin_LTLIBRARIES += plugins/shotwell-transitions/shotwell-transitions.la
-plugin_DATA += plugins/shotwell-transitions/slideshow-plugin.png
+dist_plugin_DATA += plugins/shotwell-transitions/slideshow-plugin.png
 
 plugins_shotwell_transitions_shotwell_transitions_la_SOURCES = \
        plugins/shotwell-transitions/BlindsEffect.vala \
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 132e2db..8f1312c 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,5 +1,5 @@
 uidir = $(datadir)/shotwell/ui
-ui_DATA = \
+dist_ui_DATA = \
        collection.ui \
        direct_context.ui \
        direct.ui \
@@ -24,3 +24,4 @@ ui_DATA = \
        tags.ui \
        top.ui \
        trash.ui
+