diff --git a/Makefile.am b/Makefile.am index 8bfa362e..74f81303 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,4 +30,6 @@ EXTRA_DIST = \ autogen.sh \ README.md \ $(conf_DATA) \ - irssi-icon.png + irssi-icon.png \ + meson.build \ + meson_options.txt diff --git a/docs/Makefile.am b/docs/Makefile.am index 23d61648..05ebb319 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -15,6 +15,7 @@ doc_DATA = \ startup-HOWTO.html \ startup-HOWTO.txt -EXTRA_DIST = $(doc_DATA) $(man_MANS) +EXTRA_DIST = $(doc_DATA) $(man_MANS) \ + meson.build SUBDIRS = help diff --git a/docs/help/Makefile.am.gen b/docs/help/Makefile.am.gen index abf824b4..917abe64 100644 --- a/docs/help/Makefile.am.gen +++ b/docs/help/Makefile.am.gen @@ -7,6 +7,7 @@ help_DATA = \ EXTRA_DIST = \ Makefile.am.gen \ - $(help_DATA) + $(help_DATA) \ + meson.build SUBDIRS = in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index cd795153..42b3ea7b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -14,4 +14,5 @@ script_DATA = \ scriptassist.pl \ usercount.pl -EXTRA_DIST = $(script_DATA) +EXTRA_DIST = $(script_DATA) \ + meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 48cdc3eb..83fb562f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,3 +23,5 @@ pkginc_src_HEADERS = \ common.h SUBDIRS = lib-config core irc fe-common $(PERLDIR) $(OTRDIR) $(TEXTUI) $(BOTUI) $(FUZZERUI) + +EXTRA_DIST = meson.build diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 7cf172ef..b49dad18 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -117,3 +117,5 @@ pkginc_core_HEADERS = \ tls.h \ write-buffer.h \ $(structure_headers) + +EXTRA_DIST = meson.build diff --git a/src/fe-common/Makefile.am b/src/fe-common/Makefile.am index d5f92eec..f4b78b34 100644 --- a/src/fe-common/Makefile.am +++ b/src/fe-common/Makefile.am @@ -1 +1,3 @@ SUBDIRS = core irc + +EXTRA_DIST = meson.build diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index 4e8fdcb2..7e76d3a0 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -68,3 +68,5 @@ pkginc_fe_common_core_HEADERS = \ window-items.h \ windows-layout.h \ fe-windows.h + +EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index 9efb71d3..401720f6 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -37,3 +37,5 @@ pkginc_fe_common_irc_HEADERS = \ fe-irc-channels.h \ module.h \ module-formats.h + +EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am index c6a5d79d..0be3cffa 100644 --- a/src/fe-common/irc/dcc/Makefile.am +++ b/src/fe-common/irc/dcc/Makefile.am @@ -19,3 +19,5 @@ pkginc_fe_common_irc_dcc_HEADERS = \ module.h \ module-formats.h \ fe-dcc.h + +EXTRA_DIST = meson.build diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am index b0f35fdf..6fca7676 100644 --- a/src/fe-common/irc/notifylist/Makefile.am +++ b/src/fe-common/irc/notifylist/Makefile.am @@ -13,3 +13,5 @@ pkginc_fe_common_irc_notifylistdir=$(pkgincludedir)/src/fe-common/irc/notifylist pkginc_fe_common_irc_notifylist_HEADERS = \ module.h \ module-formats.h + +EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am index 7ce2fcdd..d54c3291 100644 --- a/src/fe-fuzz/Makefile.am +++ b/src/fe-fuzz/Makefile.am @@ -35,3 +35,5 @@ server_fuzz_SOURCES = \ noinst_HEADERS = \ null-logger.h \ ../fe-text/module-formats.h + +EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/fe-common/Makefile.am b/src/fe-fuzz/fe-common/Makefile.am index 52770885..74f13119 100644 --- a/src/fe-fuzz/fe-common/Makefile.am +++ b/src/fe-fuzz/fe-common/Makefile.am @@ -1 +1,3 @@ SUBDIRS = core + +EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/fe-common/core/Makefile.am b/src/fe-fuzz/fe-common/core/Makefile.am index da8731b9..8fcd59b3 100644 --- a/src/fe-fuzz/fe-common/core/Makefile.am +++ b/src/fe-fuzz/fe-common/core/Makefile.am @@ -28,3 +28,5 @@ theme_load_fuzz_SOURCES = \ noinst_HEADERS = \ $(top_srcdir)/src/fe-text/module-formats.h + +EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/irc/Makefile.am b/src/fe-fuzz/irc/Makefile.am index 52770885..74f13119 100644 --- a/src/fe-fuzz/irc/Makefile.am +++ b/src/fe-fuzz/irc/Makefile.am @@ -1 +1,3 @@ SUBDIRS = core + +EXTRA_DIST = meson.build diff --git a/src/fe-fuzz/irc/core/Makefile.am b/src/fe-fuzz/irc/core/Makefile.am index d66c2479..33f7664d 100644 --- a/src/fe-fuzz/irc/core/Makefile.am +++ b/src/fe-fuzz/irc/core/Makefile.am @@ -28,3 +28,5 @@ event_get_params_fuzz_SOURCES = \ noinst_HEADERS = \ $(top_srcdir)/src/fe-text/module-formats.h + +EXTRA_DIST = meson.build diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am index 570d6261..44c23d6e 100644 --- a/src/fe-none/Makefile.am +++ b/src/fe-none/Makefile.am @@ -16,3 +16,5 @@ botti_SOURCES = \ noinst_HEADERS = \ module.h + +EXTRA_DIST = meson.build diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index 8835f4b9..c7044ba9 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -70,4 +70,5 @@ noinst_HEADERS = \ module-formats.h EXTRA_DIST = \ - $(terminfo_sources) + $(terminfo_sources) \ + meson.build diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am index 78a38643..a271a891 100644 --- a/src/irc/Makefile.am +++ b/src/irc/Makefile.am @@ -7,3 +7,5 @@ SUBDIRS = core dcc flood notifylist $(PROXY) noinst_LIBRARIES = libirc.a libirc_a_SOURCES = irc.c + +EXTRA_DIST = meson.build diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am index 63b41113..858d7fcb 100644 --- a/src/irc/core/Makefile.am +++ b/src/irc/core/Makefile.am @@ -57,3 +57,5 @@ pkginc_irc_core_HEADERS = \ netsplit.h \ servers-idle.h \ servers-redirect.h + +EXTRA_DIST = meson.build diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am index a81bf84d..887a65d2 100644 --- a/src/irc/dcc/Makefile.am +++ b/src/irc/dcc/Makefile.am @@ -25,3 +25,5 @@ pkginc_irc_dcc_HEADERS = \ dcc-queue.h \ module.h \ dcc-server.h + +EXTRA_DIST = meson.build diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am index b582ffe4..7a49001d 100644 --- a/src/irc/flood/Makefile.am +++ b/src/irc/flood/Makefile.am @@ -10,3 +10,5 @@ libirc_flood_a_SOURCES = \ pkginc_irc_flooddir=$(pkgincludedir)/src/irc/flood pkginc_irc_flood_HEADERS = \ module.h + +EXTRA_DIST = meson.build diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am index 421bc7d4..9bc0fd8b 100644 --- a/src/irc/notifylist/Makefile.am +++ b/src/irc/notifylist/Makefile.am @@ -15,3 +15,5 @@ pkginc_irc_notifylist_HEADERS = \ notifylist.h \ notify-setup.h \ module.h + +EXTRA_DIST = meson.build diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am index 6411f49d..2e7259ad 100644 --- a/src/irc/proxy/Makefile.am +++ b/src/irc/proxy/Makefile.am @@ -23,3 +23,5 @@ noinst_HEADERS = \ clean-generic: rm -f libirc_proxy.a + +EXTRA_DIST = meson.build diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am index d644eae5..4912aa9b 100644 --- a/src/lib-config/Makefile.am +++ b/src/lib-config/Makefile.am @@ -13,3 +13,5 @@ pkginc_lib_configdir=$(pkgincludedir)/src/lib-config pkginc_lib_config_HEADERS = \ iconfig.h \ module.h + +EXTRA_DIST = meson.build diff --git a/src/otr/Makefile.am b/src/otr/Makefile.am index ac40cbac..149b952d 100644 --- a/src/otr/Makefile.am +++ b/src/otr/Makefile.am @@ -35,3 +35,5 @@ noinst_HEADERS = \ otr-formats.h \ otr-fe.h \ otr.h + +EXTRA_DIST = meson.build diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index 45ac1eea..ad937457 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -119,7 +119,12 @@ EXTRA_DIST = \ $(common_sources) \ $(irc_sources) \ $(ui_sources) \ - $(textui_sources) + $(textui_sources) \ + meson.build \ + common/meson.build \ + irc/meson.build \ + ui/meson.build \ + textui/meson.build am_v_pl__show_gen = $(am__v_pl__show_gen_$(V)) am_v_pl__hide_gen = $(am__v_pl__hide_gen_$(V)) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8713b38f..0799ee3f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,3 +3,5 @@ TEXTUI=fe-text endif SUBDIRS = fe-common irc $(TEXTUI) + +EXTRA_DIST = meson.build diff --git a/tests/fe-common/Makefile.am b/tests/fe-common/Makefile.am index 52770885..74f13119 100644 --- a/tests/fe-common/Makefile.am +++ b/tests/fe-common/Makefile.am @@ -1 +1,3 @@ SUBDIRS = core + +EXTRA_DIST = meson.build diff --git a/tests/fe-common/core/Makefile.am b/tests/fe-common/core/Makefile.am index ddd619a0..eb7e2c7f 100644 --- a/tests/fe-common/core/Makefile.am +++ b/tests/fe-common/core/Makefile.am @@ -22,3 +22,5 @@ test_formats_LDADD = \ test_formats_SOURCES = \ test-formats.c + +EXTRA_DIST += meson.build diff --git a/tests/fe-text/Makefile.am b/tests/fe-text/Makefile.am index 2a3450e9..8f44dded 100644 --- a/tests/fe-text/Makefile.am +++ b/tests/fe-text/Makefile.am @@ -33,3 +33,5 @@ test_paste_join_multiline_SOURCES = \ ../../src/fe-text/gui-printtext.c \ mock-irssi.c \ test-paste-join-multiline.c + +EXTRA_DIST += meson.build diff --git a/tests/irc/Makefile.am b/tests/irc/Makefile.am index d42cfc87..88adb5b9 100644 --- a/tests/irc/Makefile.am +++ b/tests/irc/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = \ core \ flood + +EXTRA_DIST = meson.build diff --git a/tests/irc/core/Makefile.am b/tests/irc/core/Makefile.am index 23c1ef2c..fbf001da 100644 --- a/tests/irc/core/Makefile.am +++ b/tests/irc/core/Makefile.am @@ -26,3 +26,5 @@ test_channel_events_SOURCES = \ test_irc_SOURCES = \ test-irc.c + +EXTRA_DIST += meson.build diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am index 17885d53..f815504d 100644 --- a/tests/irc/flood/Makefile.am +++ b/tests/irc/flood/Makefile.am @@ -32,3 +32,5 @@ test_796_LDADD = \ test_796_SOURCES = \ test-796.c + +EXTRA_DIST += meson.build diff --git a/themes/Makefile.am b/themes/Makefile.am index ad0707c2..c8814532 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -2,4 +2,5 @@ themedir = $(datadir)/irssi/themes theme_DATA = default.theme colorless.theme EXTRA_DIST = \ - $(theme_DATA) + $(theme_DATA) \ + meson.build