autotools: dist all meson related build files

2019-03-30 20:06:25 +01:00 · 2019-03-30 20:06:25 +01:00 · d52dad2042
commit d52dad2042
parent 26d32f3bd0
42 changed files with 117 additions and 31 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -22,7 +22,13 @@ EXTRA_DIST +=			\
 	sanitize-la.sh		\
 	po/README.translators	\
 	po/po2tbl.sed.in	\
-	make-pot
+	make-pot	\
+	meson_options.txt	\
+	meson.build	\
+	po/meson.build	\
+	po-properties/meson.build	\
+	build-aux/meson/post-install.py	\
+	config.h.meson

 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@ -3,4 +3,7 @@ include $(top_srcdir)/Makefile.decl

 SUBDIRS = gtk-demo widget-factory icon-browser

+EXTRA_DIST = \
+	meson.build
+
 -include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@ -117,7 +117,9 @@ EXTRA_DIST += 				\
 	demo.gresource.xml		\
 	$(resource_files)		\
 	org.gtk.Demo.gschema.xml	\
-	demos.h.win32
+	demos.h.win32	\
+	meson.build	\
+	geninclude.py

 gsettings_SCHEMAS = \
 	org.gtk.Demo.gschema.xml
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@ -128,7 +128,7 @@ gtk_settings_schemas = [
  'org.gtk.Settings.Debug.gschema.xml',
 ]

-foreach s: [ '16', '22', '24', '32', '48', '256', '512']
+foreach s: [ '16', '22', '24', '32', '48', '256']
  icon_destdir = join_paths(gtk_datadir, 'icons', 'hicolor', '@0@x@0@'.format(s), 'apps')
  icons = [join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo.png'),
           join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo-symbolic.symbolic.png')]
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@ -34,7 +34,8 @@ EXTRA_DIST = \
 	menus.ui \
 	iconbrowser.gresource.xml \
 	window.ui \
-	icon.list
+	icon.list \
+	meson.build

 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk3-icon-browser
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@ -66,6 +66,7 @@ EXTRA_DIST += 				\
 	help-overlay.ui			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\
-	data/symbolic-source.svg
+	data/symbolic-source.svg	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@ -5,4 +5,7 @@ SUBDIRS = gdk gtk libgail-util

 GITIGNOREFILES = */*.1

+EXTRA_DIST += \
+	meson.build
+
 -include $(top_srcdir)/git.mk
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@ -198,7 +198,9 @@ endif
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build

 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@ -543,7 +543,9 @@ endif

 MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)

-EXTRA_DIST += $(man_MANS)
+EXTRA_DIST += \
+	$(man_MANS) \
+	meson.build

 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@ -34,6 +34,8 @@ HTML_IMAGES =
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@ -20,6 +20,9 @@ LDADDS = \
 	$(GDK_DEP_LIBS)			\
 	-lm

+EXTRA_DIST += \
+	meson.build
+
 if USE_X11
 noinst_PROGRAMS = 		\
 	doc-shooter
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@ -31,6 +31,8 @@ noinst_PROGRAMS = \
 	search-bar				\
 	listbox-dnd

-EXTRA_DIST = builder.ui
+EXTRA_DIST = \
+	builder.ui \
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/examples/application1/Makefile.am
+++ b/examples/application1/Makefile.am
@ -17,4 +17,7 @@ exampleapp_SOURCES = 				\
 	exampleapp.c exampleapp.h 		\
 	exampleappwin.c exampleappwin.h

+EXTRA_DIST = \
+	meson.build
+
 -include $(top_srcdir)/git.mk
--- a/examples/application10/Makefile.am
+++ b/examples/application10/Makefile.am
@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/application2/Makefile.am
+++ b/examples/application2/Makefile.am
@ -26,6 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui

 EXTRA_DIST = 					\
 	window.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/examples/application3/Makefile.am
+++ b/examples/application3/Makefile.am
@ -26,6 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui

 EXTRA_DIST = 					\
 	window.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/examples/application4/Makefile.am
+++ b/examples/application4/Makefile.am
@ -27,6 +27,7 @@ resources.c: exampleapp.gresource.xml window.ui app-menu.ui
 EXTRA_DIST = 					\
 	window.ui 				\
 	app-menu.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/examples/application5/Makefile.am
+++ b/examples/application5/Makefile.am
@ -38,7 +38,8 @@ EXTRA_DIST = 					\
 	window.ui 				\
 	app-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/application6/Makefile.am
+++ b/examples/application6/Makefile.am
@ -40,7 +40,8 @@ EXTRA_DIST = 					\
 	app-menu.ui 				\
 	prefs.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/application7/Makefile.am
+++ b/examples/application7/Makefile.am
@ -40,7 +40,8 @@ EXTRA_DIST = 					\
 	app-menu.ui 				\
 	prefs.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/application8/Makefile.am
+++ b/examples/application8/Makefile.am
@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/application9/Makefile.am
+++ b/examples/application9/Makefile.am
@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build

 CLEANFILES = 					\
 	gschemas.compiled
--- a/examples/bp/Makefile.am
+++ b/examples/bp/Makefile.am
@ -27,6 +27,8 @@ bloatpad-gresources.c: $(resource_files)

 CLEANFILES = bloatpad-gresources.c

-EXTRA_DIST = $(resource_files)
+EXTRA_DIST = \
+	$(resource_files) \
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@ -31,7 +31,10 @@ EXTRA_DIST += 			\
 	makefile.msc		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
-	gdkversionmacros.h.in
+	gdkversionmacros.h.in	\
+	meson.build \
+	gen-gdk-gresources-xml.py \
+	gdkconfig.h.meson

 GDK_CFLAGS_DEFINES =	\
 	-DG_LOG_USE_STRUCTURED=1	\
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@ -108,6 +108,8 @@ EXTRA_DIST += $(broadway_built_sources)

 BUILT_SOURCES = $(broadway_built_sources)

+EXTRA_DIST += meson.build
+
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gdk3-broadway broadwayd

--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@ -72,5 +72,7 @@ libgdkquartzinclude_HEADERS =		\
 	gdkquartzvisual.h		\
 	gdkquartzwindow.h

+EXTRA_DIST += \
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@ -107,6 +107,7 @@ endef
 EXTRA_DIST += 					\
 	protocol/gtk-primary-selection.xml	\
 	protocol/gtk-shell.xml			\
-	protocol/server-decoration.xml
+	protocol/server-decoration.xml	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@ -29,7 +29,8 @@ SUBDIRS=rc

 EXTRA_DIST += \
 	bdfcursor.c \
-	makefile.msc
+	makefile.msc \
+	meson.build

 libgdk_win32_la_SOURCES = \
 	gdkcursor-win32.c \
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@ -90,6 +90,7 @@ libgdkx11include_HEADERS = 	\
 # We need to include all these C files here since the conditionals
 # don't seem to be correctly expanded for the dist files.
 EXTRA_DIST += 			\
-	gdksettings.c
+	gdksettings.c	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@ -1776,6 +1776,15 @@ EXTRA_DIST +=                   \
 	gtktypebuiltins.c.template \
 	gtktypebuiltins.h.template \
 	gtkprivatetypebuiltins.c.template \
-	gtkprivatetypebuiltins.h.template
+	gtkprivatetypebuiltins.h.template \
+	meson.build \
+	gen-gtk-gresources-xml.py \
+	gentypefuncs.py \
+	a11y/meson.build \
+	deprecated/meson.build \
+	inspector/meson.build \
+	theme/Adwaita/meson.build \
+	theme/HighContrast/meson.build
+

 -include $(top_srcdir)/git.mk
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@ -1,6 +1,9 @@
 include $(top_srcdir)/Makefile.decl

-EXTRA_DIST += gailutil.def
+EXTRA_DIST += \
+	gailutil.def \
+	meson.build
+
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
 gailutil.def: libgailutil-3.la
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@ -6,4 +6,7 @@ if OS_UNIX
 SUBDIRS += printbackends
 endif

+EXTRA_DIST += \
+	meson.build
+
 -include $(top_srcdir)/git.mk
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@ -307,7 +307,11 @@ BUILT_SOURCES = $(protocol_built_sources) $(protocol_built_sources_gtk)
 EXTRA_DIST += $(protocol_built_sources) $(protocol_built_sources_gtk)
 endif

-EXTRA_DIST += README.multipress
+EXTRA_DIST += \
+	README.multipress \
+	meson.build \
+	text-input-unstable-v3.xml \
+	gtk-text-input.xml

 CLEANFILES = immodules.cache

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -573,6 +573,7 @@ EXTRA_DIST += 			\
 	mydialog.ui		\
 	mydialog2.ui		\
 	popover.ui		\
-	selectionmode.ui
+	selectionmode.ui	\
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/tests/visuals/Makefile.am
+++ b/tests/visuals/Makefile.am
@ -31,6 +31,7 @@ EXTRA_DIST = \
 	linked-buttons-vertical.ui \
 	osd-toolbars.ui \
 	primary-toolbar.ui \
-	suggested-action-buttons.ui
+	suggested-action-buttons.ui \
+	meson.build

 -include $(top_srcdir)/git.mk
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@ -2,5 +2,8 @@ include $(top_srcdir)/Makefile.decl

 SUBDIRS = gdk gtk a11y css reftests tools

+EXTRA_DIST += \
+	meson.build
+
 -include $(top_srcdir)/git.mk

--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@ -25,7 +25,9 @@ LDADD = \
 TEST_PROGS += api
 test_in_files += api.test.in

-EXTRA_DIST += $(test_in_files)
+EXTRA_DIST += \
+	$(test_in_files) \
+	meson.build

 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css
--- a/testsuite/css/nodes/Makefile.am
+++ b/testsuite/css/nodes/Makefile.am
@ -57,7 +57,7 @@ test_data = \
 	scale.ui		scale.nodes			\
 	$(NULL)

-EXTRA_DIST += $(test_in_files) $(test_data)
+EXTRA_DIST += $(test_in_files) $(test_data) meson.build

 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/nodes
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@ -474,6 +474,9 @@ test_data = \

 EXTRA_DIST += $(test_in_files) $(test_data)

+EXTRA_DIST += \
+	meson.build
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser
 insttest_PROGRAMS = $(TEST_PROGS)
@ -488,7 +491,8 @@ test_files = $(test_in_files:.test.in=.test)
 $(test_files): %.test: %.test.in
 	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@

-EXTRA_DIST += $(test_in_files)
+EXTRA_DIST += \
+	$(test_in_files)

 CLEANFILES += $(test_files)

--- a/testsuite/css/style/Makefile.am
+++ b/testsuite/css/style/Makefile.am
@ -51,6 +51,7 @@ EXTRA_DIST += \
 	$(resource_files)		\
 	$(test_in_files) 		\
 	$(test_data)			\
+	meson.build	\
 	$(NULL)

 if BUILDOPT_INSTALL_TESTS
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@ -33,6 +33,9 @@ CLEANFILES = 			\
 	gdksurface.png		\
 	$(NULL)

+EXTRA_DIST += \
+	meson.build
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@ -265,6 +265,7 @@ EXTRA_DIST +=				\
 	file-chooser-test-dir/text.txt	\
 	$(test_icontheme)		\
 	$(test_ui)			\
+	meson.build	\
 	$(NULL)

 GTK_GSETTINGS_SCHEMAS = \