GNOME.org
 

[gnome-settings-daemon/wip/inigomartinez/meson: 4/5] build: Add meson build files to distributable files

commit e8ba45c38ae0dee67ed76ee65ff11119b18e418b
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Feb 1 09:34:48 2018 +0100

    build: Add meson build files to distributable files
    
    Although it is possible to generate distributable files on meson
    since version 0.41 by using the `ninja dist` command, autotools does
    different things that end up creating a different distributable
    file.
    
    meson build files have been added to autotools build files as
    distributable files, so the whole meson port would also be
    distributed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793087

 Makefile.am                             |    4 ++++
 data/Makefile.am                        |    1 +
 gnome-settings-daemon/Makefile.am       |    1 +
 plugins/Makefile.am                     |    2 ++
 plugins/a11y-keyboard/Makefile.am       |    1 +
 plugins/a11y-settings/Makefile.am       |    3 ++-
 plugins/clipboard/Makefile.am           |    1 +
 plugins/color/Makefile.am               |    3 ++-
 plugins/common/Makefile.am              |    6 +++++-
 plugins/datetime/Makefile.am            |    3 ++-
 plugins/dummy/Makefile.am               |    4 +++-
 plugins/housekeeping/Makefile.am        |    4 +++-
 plugins/keyboard/Makefile.am            |    1 +
 plugins/media-keys/Makefile.am          |    3 ++-
 plugins/mouse/Makefile.am               |    5 ++++-
 plugins/power/Makefile.am               |    1 +
 plugins/print-notifications/Makefile.am |    3 ++-
 plugins/rfkill/Makefile.am              |    6 +++++-
 plugins/screensaver-proxy/Makefile.am   |    4 +++-
 plugins/sharing/Makefile.am             |    5 ++++-
 plugins/smartcard/Makefile.am           |    3 ++-
 plugins/sound/Makefile.am               |    5 +++--
 plugins/wacom/Makefile.am               |    4 +++-
 plugins/xsettings/Makefile.am           |    1 +
 tests/Makefile.am                       |    1 +
 25 files changed, 59 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0e032d3..7b997e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,10 @@ EXTRA_DIST = \
        MAINTAINERS             \
        ChangeLog               \
        README                  \
+       meson.build             \
+       meson_options.txt       \
+       meson_post_install.py   \
+       po/meson.build          \
        $(NULL)
 
 DISTCLEANFILES = \
diff --git a/data/Makefile.am b/data/Makefile.am
index 06fd2b3..f4087c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST =                                  \
        $(gsettings_ENUM_FILES)                 \
        gnome-settings-daemon.pc.in             \
        $(api_DATA)                             \
+       meson.build                             \
        $(NULL)
 
 DISTCLEANFILES =                       \
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 2fac5e5..8acf9c7 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -86,6 +86,7 @@ EXTRA_DIST = \
        org.gnome.SessionManager.xml        \
        org.gnome.ScreenSaver.xml           \
        org.gnome.Shell.xml                 \
+       meson.build                         \
        $(NULL)
 
 CLEANFILES = $(gsd_SCRIPTS)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 6de38f0..c3a72ff 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -46,3 +46,5 @@ endif
 
 SUBDIRS = common $(enabled_plugins)
 DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)
+
+EXTRA_DIST = meson.build
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index e57e882..722c553 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -31,6 +31,7 @@ org.gnome.SettingsDaemon.A11yKeyboard.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                   \
        $(desktop_in_files)     \
+       meson.build             \
        $(NULL)
 
 CLEANFILES =                   \
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index d27e7c2..a763bc4 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -28,7 +28,8 @@ org.gnome.SettingsDaemon.A11ySettings.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =                   \
-       $(desktop_in_files)
+       $(desktop_in_files)     \
+       meson.build
 
 CLEANFILES =                   \
        $(desktop_DATA)
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 3189ac6..b052133 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -35,6 +35,7 @@ org.gnome.SettingsDaemon.Clipboard.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                   \
        $(desktop_in_files)     \
+       meson.build             \
        $(NULL)
 
 CLEANFILES =                   \
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 35dcad4..bb30934 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -87,7 +87,8 @@ org.gnome.SettingsDaemon.Color.desktop: $(desktop_in_files) Makefile
 EXTRA_DIST =                                   \
        $(desktop_in_files)                     \
        test-data/Lenovo-T61-Internal.bin       \
-       test-data/LG-L225W-External.bin
+       test-data/LG-L225W-External.bin         \
+       meson.build
 
 CLEANFILES +=                          \
        $(desktop_DATA)
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 36cf17c..780322c 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -66,7 +66,11 @@ gsd_test_input_helper_SOURCES = test-input-helper.c
 gsd_test_input_helper_LDADD = libcommon.la
 gsd_test_input_helper_CFLAGS = $(libcommon_la_CFLAGS)
 
-EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h
+EXTRA_DIST = \
+       $(scripts_DATA)         \
+       daemon-skeleton.h       \
+       daemon-skeleton-gtk.h   \
+       meson.build
 
 CLEANFILES = \
        $(GSD_COMMON_ENUM_FILES)
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 48ba891..1b5b586 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -52,7 +52,8 @@ org.gnome.SettingsDaemon.Datetime.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                           \
        timedated1-interface.xml        \
-       $(desktop_in_files)
+       $(desktop_in_files)             \
+       meson.build
 
 CLEANFILES = \
        $(desktop_DATA)
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index cb5856c..5624b1e 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -38,7 +38,9 @@ endif
 %.desktop: org.gnome.SettingsDaemon.Dummy.desktop.in Makefile
        $(AM_V_GEN) PLUGINNAME=`echo $@ | sed 's,.desktop,,'` && sed -e "s|\@pluginname\@|$$PLUGINNAME|" -e 
"s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = org.gnome.SettingsDaemon.Dummy.desktop.in
+EXTRA_DIST =                                           \
+       org.gnome.SettingsDaemon.Dummy.desktop.in       \
+       meson.build
 
 CLEANFILES = $(NULL)
 
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 3841edf..b1f8b00 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -60,7 +60,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Housekeeping.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(desktop_in_files)
+EXTRA_DIST =                   \
+       $(desktop_in_files)     \
+       meson.build
 
 CLEANFILES = $(desktop_DATA)
 
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index e4e6dfe..f949b0e 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -36,6 +36,7 @@ org.gnome.SettingsDaemon.Keyboard.desktop: $(desktop_in_files) Makefile
 
 EXTRA_DIST =                   \
        $(desktop_in_files)     \
+       meson.build             \
        $(NULL)
 
 CLEANFILES =                   \
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index d278588..5612d98 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -85,7 +85,8 @@ EXTRA_DIST =                          \
        README.media-keys-API           \
        org.gnome.ShellKeyGrabber.xml   \
        $(plugin_in_files)              \
-       $(desktop_in_files)
+       $(desktop_in_files)             \
+       meson.build
 
 CLEANFILES =                   \
        $(BUILT_SOURCES)        \
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index fa095c3..d8384e4 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -45,6 +45,9 @@ gsd_mouse_LDADD =                                             \
        $(MOUSE_LIBS)                                           \
        $(LIBM)
 
-EXTRA_DIST = $(desktop_in_files)
+EXTRA_DIST = \
+       $(desktop_in_files)     \
+       meson.build
+
 CLEANFILES = $(desktop_DATA)
 DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 7a7ba8d..710082c 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -61,6 +61,7 @@ gsd_power_LDADD =                                     \
 EXTRA_DIST =                                           \
        $(desktop_in_files)                             \
        $(gsd_backlight_helper_SOURCES)                 \
+       meson.build                                     \
        $(NULL)
 
 if HAVE_GUDEV
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index 0e6b6d7..423aae9 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -47,7 +47,8 @@ gsd_print_notifications_LDADD =                               \
        $(PRINT_NOTIFICATIONS_LIBS)
 
 EXTRA_DIST =                   \
-       $(desktop_in_files)
+       $(desktop_in_files)     \
+       meson.build
 
 CLEANFILES =                   \
        $(desktop_DATA)
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 3c5ec47..5dded25 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -33,6 +33,10 @@ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
 udevrulesdir = $(prefix)/lib/udev/rules.d
 udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
 
-EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+EXTRA_DIST =                   \
+       $(udevrules_DATA)       \
+       $(desktop_in_files)     \
+       meson.build
+
 CLEANFILES = $(desktop_DATA)
 DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index 3c9de44..45893d5 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -32,7 +32,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.ScreensaverProxy.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(desktop_in_files)
+EXTRA_DIST =                   \
+       $(desktop_in_files)     \
+       meson.build
 
 CLEANFILES = $(desktop_DATA)
 
diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am
index df99688..df9c736 100644
--- a/plugins/sharing/Makefile.am
+++ b/plugins/sharing/Makefile.am
@@ -27,6 +27,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Sharing.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = $(desktop_in_files)
+EXTRA_DIST =                   \
+       $(desktop_in_files)     \
+       meson.build
+
 CLEANFILES = $(desktop_DATA)
 DISTCLEANFILES = $(desktop_DATA)
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 4a2951a..bffaa92 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -66,7 +66,8 @@ EXTRA_DIST = \
        gsd-smartcard-enum-types.c.in \
        gsd-smartcard-enum-types.h.in \
        org.gnome.SettingsDaemon.Smartcard.xml \
-       $(desktop_in_files)
+       $(desktop_in_files) \
+       meson.build
 
 CLEANFILES = \
        $(BUILT_SOURCES) \
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 472bdbf..c1bb134 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -27,8 +27,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 org.gnome.SettingsDaemon.Sound.desktop: $(desktop_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = \
-       $(desktop_in_files)
+EXTRA_DIST =                   \
+       $(desktop_in_files)     \
+       meson.build
 
 CLEANFILES = \
        $(desktop_DATA)
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 1637a19..fc01851 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -28,7 +28,9 @@ gsd_wacom_oled_helper_CFLAGS =                                \
        $(WACOM_OLED_CFLAGS)
 endif
 
-EXTRA_DIST = org.gnome.settings-daemon.plugins.wacom.policy.in.in
+EXTRA_DIST =                                                   \
+       org.gnome.settings-daemon.plugins.wacom.policy.in.in    \
+       meson.build
 
 gsd_wacom_SOURCES =            \
        main.c                  \
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index bc62c8a..5a82b3e 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -95,6 +95,7 @@ org.gnome.SettingsDaemon.XSettings.desktop: $(desktop_in_files) Makefile
 EXTRA_DIST =                   \
        README.xsettings        \
        $(desktop_in_files)     \
+       meson.build             \
        $(NULL)
 
 CLEANFILES =                   \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index da78a69..6453ce5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,4 +8,5 @@ EXTRA_DIST =                    \
        gsdtestcase.py          \
        dummy.session           \
        dummyapp.desktop        \
+       meson.build             \
        $(NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]