[shotwell] Fix make distcheck



commit 1cc6334df12fe3d56b6e10216e6a98c43d3c274e
Author: Jens Georg <mail jensge org>
Date:   Mon Aug 15 20:37:40 2016 +0200

    Fix make distcheck
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am      |    4 +++-
 import.am        |    7 +++++--
 publish-extra.am |    6 ++++--
 publish.am       |    6 ++++--
 transition.am    |    7 +++++--
 5 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 810ac1c..c133334 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ AUTHORS:
 dist-hook: dist-ChangeLog
 #      find $(distdir) -name "*.c" -o -name "shotwell*.h" -o -name "shotwell*.vapi" -o -name "*vala.stamp" 
-exec rm {} \;
 
-INTAINERCLEANFILES = \
+MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
@@ -122,6 +122,8 @@ pkglibexec_PROGRAMS =
 dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
 dist_noinst_DATA = $(NULL)
 
+MOSTLYCLEANFILES = $(NULL)
+
 include $(top_srcdir)/common.am
 include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
diff --git a/import.am b/import.am
index af9a82a..cbab67c 100644
--- a/import.am
+++ b/import.am
@@ -1,5 +1,7 @@
 plugin_LTLIBRARIES += plugins/shotwell-data-imports/shotwell-data-imports.la
-dist_noinst_DATA += plugins/shotwell-data-imports/f-spot-24.png
+dist_noinst_DATA += \
+       plugins/shotwell-data-imports/f-spot-24.png \
+       plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
 
 plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
        plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala \
@@ -20,9 +22,10 @@ plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
 
 nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
        plugins/shotwell-data-imports/resource.c
+MOSTLYCLEANFILES += plugins/shotwell-data-imports/resource.c
 
 plugins/shotwell-data-imports/resource.c: 
plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=plugins/shotwell-data-imports --generate 
$<
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ 
--sourcedir=$(abs_top_srcdir)/plugins/shotwell-data-imports --generate $<
 
 plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
diff --git a/publish-extra.am b/publish-extra.am
index 89143b0..7448bf6 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -10,7 +10,8 @@ dist_noinst_DATA += \
        plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
        plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
        plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
-       plugins/shotwell-publishing-extras/yandex_publish_model.ui
+       plugins/shotwell-publishing-extras/yandex_publish_model.ui \
+       plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
 
 plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
        plugins/shotwell-publishing-extras/GalleryConnector.vala \
@@ -22,9 +23,10 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
 
 nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
        plugins/shotwell-publishing-extras/resource.c
+MOSTLYCLEANFILES += plugins/shotwell-publishing-extras/resource.c
 
 plugins/shotwell-publishing-extras/resource.c: 
plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=plugins/shotwell-publishing-extras 
--generate $<
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ 
--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing-extras --generate $<
 
 
 plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
diff --git a/publish.am b/publish.am
index d06abcc..194dcb6 100644
--- a/publish.am
+++ b/publish.am
@@ -12,7 +12,8 @@ dist_noinst_DATA += \
        plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
        plugins/shotwell-publishing/piwigo_authentication_pane.ui \
        plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
-       plugins/shotwell-publishing/youtube_publishing_options_pane.ui
+       plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
+       plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
 
 plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
        plugins/shotwell-publishing/shotwell-publishing.vala \
@@ -25,9 +26,10 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 
 nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
        plugins/shotwell-publishing/resource.c
+MOSTLYCLEANFILES += plugins/shotwell-publishing/resource.c
 
 plugins/shotwell-publishing/resource.c: 
plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=plugins/shotwell-publishing --generate $<
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ 
--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing --generate $<
 
 plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
diff --git a/transition.am b/transition.am
index 50a3aac..ca7bbd4 100644
--- a/transition.am
+++ b/transition.am
@@ -1,5 +1,7 @@
 plugin_LTLIBRARIES += plugins/shotwell-transitions/shotwell-transitions.la
-dist_noinst_DATA += plugins/shotwell-transitions/slideshow-plugin.png
+dist_noinst_DATA += \
+       plugins/shotwell-transitions/slideshow-plugin.png \
+       plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
 
 plugins_shotwell_transitions_shotwell_transitions_la_SOURCES = \
        plugins/shotwell-transitions/BlindsEffect.vala \
@@ -17,9 +19,10 @@ plugins_shotwell_transitions_shotwell_transitions_la_SOURCES = \
 
 nodist_plugins_shotwell_transitions_shotwell_transitions_la_SOURCES = \
        plugins/shotwell-transitions/resource.c
+MOSTLYCLEANFILES += plugins/shotwell-transitions/resource.c
 
 plugins/shotwell-transitions/resource.c: 
plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=plugins/shotwell-transitions --generate 
$<
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ 
--sourcedir=$(abs_top_srcdir)/plugins/shotwell-transitions --generate $<
 
 plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]