[gnome-todo] project: Add meson files as extra files in autotools
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo] project: Add meson files as extra files in autotools
- Date: Thu, 10 Aug 2017 10:10:15 +0000 (UTC)
commit 9fb548ea2ef82d3a407aa36b58513cb8db16f25e
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Sun Aug 6 21:34:59 2017 +0200
project: Add meson files as extra files in autotools
This patch adds meson files as extra files in autotools, so they are
included when creating the distributable package.
https://bugzilla.gnome.org/show_bug.cgi?id=785901
Makefile.am | 7 ++++++-
data/Makefile.am | 2 ++
data/icons/Makefile.am | 1 +
doc/reference/Makefile.am | 6 ++++--
plugins/Makefile.am | 1 +
plugins/background/Makefile.am | 3 ++-
plugins/dark-theme/Makefile.am | 3 ++-
plugins/eds/Makefile.am | 4 ++--
plugins/scheduled-panel/Makefile.am | 3 ++-
plugins/score/Makefile.am | 3 ++-
plugins/today-panel/Makefile.am | 3 ++-
plugins/todo-txt/Makefile.am | 4 ++--
plugins/todoist/Makefile.am | 4 ++--
plugins/unscheduled-panel/Makefile.am | 3 ++-
src/Makefile.am | 3 ++-
15 files changed, 34 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5baa27f..815ad99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,12 @@ EXTRA_DIST = \
README \
COPYING \
AUTHORS \
- NEWS
+ NEWS \
+ meson.build \
+ meson_options.txt \
+ meson_post_install.py \
+ configure_meson \
+ po/meson.build
DISTCHECK_CONFIGURE_FLAGS = \
--enable-appstream-util \
diff --git a/data/Makefile.am b/data/Makefile.am
index 827ee36..d6b9c9d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -37,6 +37,8 @@ service_in_files = org.gnome.Todo.service.in
EXTRA_DIST= \
appdata/org.gnome.Todo.appdata.xml \
+ appdata/meson.build \
+ meson.build \
org.gnome.Todo.Autostart.desktop \
org.gnome.Todo.desktop \
todo.gresource.xml \
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 71f0e73..7bd2ee3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -40,6 +40,7 @@ update-icon-cache:
EXTRA_DIST = \
$(hicolor_icon_files) \
+ meson.build \
$(NULL)
-include $(top_srcdir)/git.mk
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index d41d343..78083c7 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -113,8 +113,10 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += \
- version.xml.in
-
+ version.xml.in \
+ meson.build \
+ xml/gtkdocentities.ent.in \
+ xml/meson.build
if ENABLE_GTK_DOC
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8735ee4..835d1dc 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -33,3 +33,4 @@ SUBDIRS += todoist
endif
MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = meson.build
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index e05d33c..5383367 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -17,4 +17,5 @@ libbackground_la_CFLAGS = \
EXTRA_DIST = \
$(gsettings_SCHEMAS) \
- background.plugin.in
+ background.plugin.in \
+ meson.build
diff --git a/plugins/dark-theme/Makefile.am b/plugins/dark-theme/Makefile.am
index c51292f..c93acf3 100644
--- a/plugins/dark-theme/Makefile.am
+++ b/plugins/dark-theme/Makefile.am
@@ -14,4 +14,5 @@ libdarktheme_la_CFLAGS = \
$(GNOME_TODO_PLUGIN_WARN_CFLAGS)
EXTRA_DIST = \
- dark-theme.plugin.in
+ dark-theme.plugin.in \
+ meson.build
diff --git a/plugins/eds/Makefile.am b/plugins/eds/Makefile.am
index 0699d7c..4e5f866 100644
--- a/plugins/eds/Makefile.am
+++ b/plugins/eds/Makefile.am
@@ -19,5 +19,5 @@ libeds_la_CFLAGS = \
$(GNOME_TODO_PLUGIN_WARN_CFLAGS)
EXTRA_DIST = \
- eds.plugin.in
-
+ eds.plugin.in \
+ meson.build
diff --git a/plugins/scheduled-panel/Makefile.am b/plugins/scheduled-panel/Makefile.am
index 7ac1fd5..085ab1c 100644
--- a/plugins/scheduled-panel/Makefile.am
+++ b/plugins/scheduled-panel/Makefile.am
@@ -16,4 +16,5 @@ libscheduledpanel_la_CFLAGS = \
$(GNOME_TODO_PLUGIN_WARN_CFLAGS)
EXTRA_DIST = \
- scheduled-panel.plugin.in
+ scheduled-panel.plugin.in \
+ meson.build
diff --git a/plugins/score/Makefile.am b/plugins/score/Makefile.am
index 3c912d5..ac32656 100644
--- a/plugins/score/Makefile.am
+++ b/plugins/score/Makefile.am
@@ -7,4 +7,5 @@ nobase_score_plugin_DATA = \
EXTRA_DIST = \
$(plugin_DATA) \
- $(nobase_score_plugin_DATA)
+ $(nobase_score_plugin_DATA) \
+ meson.build
diff --git a/plugins/today-panel/Makefile.am b/plugins/today-panel/Makefile.am
index c8938a9..7439597 100644
--- a/plugins/today-panel/Makefile.am
+++ b/plugins/today-panel/Makefile.am
@@ -16,4 +16,5 @@ libtodaypanel_la_CFLAGS = \
$(GNOME_TODO_PLUGIN_WARN_CFLAGS)
EXTRA_DIST = \
- today-panel.plugin.in
+ today-panel.plugin.in \
+ meson.build
diff --git a/plugins/todo-txt/Makefile.am b/plugins/todo-txt/Makefile.am
index cf1f3ba..8f4e1d6 100644
--- a/plugins/todo-txt/Makefile.am
+++ b/plugins/todo-txt/Makefile.am
@@ -20,5 +20,5 @@ libtodotxt_la_CFLAGS = \
EXTRA_DIST = \
$(gsettings_SCHEMAS) \
- todo-txt.plugin.in
-
+ todo-txt.plugin.in \
+ meson.build
diff --git a/plugins/todoist/Makefile.am b/plugins/todoist/Makefile.am
index 6d5c685..21158cf 100644
--- a/plugins/todoist/Makefile.am
+++ b/plugins/todoist/Makefile.am
@@ -16,5 +16,5 @@ libtodoist_la_CFLAGS = \
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"
EXTRA_DIST = \
- todoist.plugin.in
-
+ todoist.plugin.in \
+ meson.build
diff --git a/plugins/unscheduled-panel/Makefile.am b/plugins/unscheduled-panel/Makefile.am
index c056458..14d9530 100644
--- a/plugins/unscheduled-panel/Makefile.am
+++ b/plugins/unscheduled-panel/Makefile.am
@@ -7,4 +7,5 @@ nobase_unscheduled_panel_plugin_DATA = \
EXTRA_DIST = \
$(plugin_DATA) \
- $(nobase_unscheduled_panel_plugin_DATA)
+ $(nobase_unscheduled_panel_plugin_DATA) \
+ meson.build
diff --git a/src/Makefile.am b/src/Makefile.am
index 4aaebdf..da568c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,7 +179,8 @@ CLEANFILES = \
EXTRA_DIST = \
$(resource_files) \
gtd-enum-types.h.template \
- gtd-enum-types.c.template
+ gtd-enum-types.c.template \
+ meson.build
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]