From 4829d936edc66de2af4fd1541bfdff57f0178747 Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Sat, 23 Nov 2019 23:16:56 +0100 Subject: build: Dist meson files with autotools --- Makefile.am | 5 ++++- data/Makefile.am | 4 +++- data/xml/Makefile.am | 2 +- doc/Makefile.am | 4 +++- doc/reference/Makefile.am | 8 +++++++- examples/Makefile.am | 3 ++- examples/renderer-plugins/C/Makefile.am | 4 ++-- examples/renderer-plugins/Makefile.am | 1 + examples/renderer-plugins/vala/Makefile.am | 4 ++-- examples/server-plugins/C/Makefile.am | 4 ++-- examples/server-plugins/Makefile.am | 1 + examples/server-plugins/vala/Makefile.am | 4 ++-- src/Makefile.am | 2 ++ src/librygel-core/Makefile.am | 3 ++- src/librygel-db/Makefile.am | 2 +- src/librygel-renderer-gst/Makefile.am | 2 +- src/librygel-renderer/Makefile.am | 2 +- src/librygel-ruih/Makefile.am | 2 +- src/librygel-server/Makefile.am | 2 +- src/media-engines/Makefile.am | 2 ++ src/media-engines/gstreamer/Makefile.am | 2 +- src/media-engines/simple/Makefile.am | 2 +- src/plugins/Makefile.am | 2 ++ src/plugins/external/Makefile.am | 2 +- src/plugins/gst-launch/Makefile.am | 2 +- src/plugins/lms/Makefile.am | 2 +- src/plugins/media-export/Makefile.am | 2 +- src/plugins/mpris/Makefile.am | 2 +- src/plugins/playbin/Makefile.am | 2 +- src/plugins/ruih/Makefile.am | 2 +- src/plugins/tracker/Makefile.am | 2 +- src/rygel/Makefile.am | 3 ++- src/ui/Makefile.am | 2 ++ tests/Makefile.am | 6 +++--- 34 files changed, 60 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am index 17924ad7..182f92cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,10 @@ EXTRA_DIST = rygel-core-2.6.pc.in rygel-renderer-2.6.pc.in rygel-ruih-2.0.pc.in build-aux/config.rpath \ build-aux/git-version-gen \ COPYING.logo \ - README.md + README.md \ + meson.build \ + meson_options.txt \ + po/meson.build AM_DISTCHECK_CONFIGURE_FLAGS = --with-systemduserunitdir='$${libdir}/systemd/user-distcheck' diff --git a/data/Makefile.am b/data/Makefile.am index bbd66585..5b55df4d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -54,4 +54,6 @@ EXTRA_DIST = $(dbusservice_in_files) \ $(sysconf_DATA) \ $(pixmaps_DATA) \ $(preset_DATA) \ - $(systemdservice_in_files) + $(systemdservice_in_files) \ + presets/meson.build \ + meson.build diff --git a/data/xml/Makefile.am b/data/xml/Makefile.am index cad1ca73..c237abae 100644 --- a/data/xml/Makefile.am +++ b/data/xml/Makefile.am @@ -20,7 +20,7 @@ xml_DATA = $(xml_in_files:.xml.in=.xml) xmldir = $(datadir)/rygel/xml -EXTRA_DIST = $(xml_in_files) MediaServer3.xml.in.in MediaRenderer2.xml.in.in RuihServer2.xml.in.in +EXTRA_DIST = $(xml_in_files) MediaServer3.xml.in.in MediaRenderer2.xml.in.in RuihServer2.xml.in.in meson.build process-xml.py CLEANFILES = $(xml_DATA) MAINTAINERCLEANFILES = Makefile.in MediaServer3.xml.in MediaRenderer2.xml.in RuihServer2.xml.in diff --git a/doc/Makefile.am b/doc/Makefile.am index c8956588..8810840e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,9 @@ SUBDIRS = reference EXTRA_DIST = \ man/rygel.xml \ - man/rygel.conf.xml + man/rygel.conf.xml \ + meson.build \ + man/meson.build if HAVE_XSLTPROC dist_man1_MANS = \ diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 0acd3572..24246b3a 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -4,4 +4,10 @@ if HAVE_GSTREAMER SUBDIRS += librygel-renderer-gst endif -EXTRA_DIST = doc-build.am +EXTRA_DIST = doc-build.am \ + meson.build \ + librygel-core/meson.build \ + librygel-server/meson.build \ + librygel-renderer/meson.build \ + librygel-db/meson.build \ + librygel-renderer-gst/meson.build diff --git a/examples/Makefile.am b/examples/Makefile.am index f3552487..aa97ed62 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -71,4 +71,5 @@ service/sysv/rygel \ service/README.Ubuntu \ service/upstart/rygel.conf \ service/systemd/rygel.service \ -org.gnome.Rygel.FullscreenRenderer.gresource.xml +org.gnome.Rygel.FullscreenRenderer.gresource.xml \ +meson.build diff --git a/examples/renderer-plugins/C/Makefile.am b/examples/renderer-plugins/C/Makefile.am index b952bc84..8d445f8a 100644 --- a/examples/renderer-plugins/C/Makefile.am +++ b/examples/renderer-plugins/C/Makefile.am @@ -18,8 +18,8 @@ librygel_example_renderer_plugin_c_la_CFLAGS = \ librygel_example_renderer_plugin_c_la_LIBADD = \ $(EXAMPLE_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) - + librygel_example_renderer_plugin_c_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = example-renderer-c.plugin.in +EXTRA_DIST = example-renderer-c.plugin.in meson.build diff --git a/examples/renderer-plugins/Makefile.am b/examples/renderer-plugins/Makefile.am index 35572512..06cdbdda 100644 --- a/examples/renderer-plugins/Makefile.am +++ b/examples/renderer-plugins/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = vala C +EXTRA_DIST = meson.build diff --git a/examples/renderer-plugins/vala/Makefile.am b/examples/renderer-plugins/vala/Makefile.am index a9e9090d..669acd73 100644 --- a/examples/renderer-plugins/vala/Makefile.am +++ b/examples/renderer-plugins/vala/Makefile.am @@ -18,8 +18,8 @@ librygel_example_renderer_plugin_vala_la_CFLAGS = \ librygel_example_renderer_plugin_vala_la_LIBADD = \ $(EXAMPLE_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) - + librygel_example_renderer_plugin_vala_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = example-renderer-vala.plugin.in +EXTRA_DIST = example-renderer-vala.plugin.in meson.build diff --git a/examples/server-plugins/C/Makefile.am b/examples/server-plugins/C/Makefile.am index 8312f2bf..cfce62ad 100644 --- a/examples/server-plugins/C/Makefile.am +++ b/examples/server-plugins/C/Makefile.am @@ -18,8 +18,8 @@ librygel_example_server_plugin_c_la_LIBADD = \ $(EXAMPLE_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \ $(RYGEL_COMMON_SERVER_LIBS) - + librygel_example_server_plugin_c_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = example-server-c.plugin.in +EXTRA_DIST = example-server-c.plugin.in meson.build diff --git a/examples/server-plugins/Makefile.am b/examples/server-plugins/Makefile.am index 35572512..c590c1c6 100644 --- a/examples/server-plugins/Makefile.am +++ b/examples/server-plugins/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = vala C +EXTRA_DIST = meson.build diff --git a/examples/server-plugins/vala/Makefile.am b/examples/server-plugins/vala/Makefile.am index 424075ca..f41f21f0 100644 --- a/examples/server-plugins/vala/Makefile.am +++ b/examples/server-plugins/vala/Makefile.am @@ -22,8 +22,8 @@ librygel_example_server_plugin_vala_la_CFLAGS = \ librygel_example_server_plugin_vala_la_LIBADD = \ $(EXAMPLE_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) - + librygel_example_server_plugin_vala_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = example-server-vala.plugin.in +EXTRA_DIST = example-server-vala.plugin.in meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 8e6937bb..cf7edfb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,3 +14,5 @@ MAINTAINERCLEANFILES = Makefile.in vala-clean: rm -f `find . -name "*.stamp"` + +EXTRA_DIST = meson.build diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am index e90c54f2..3ac36172 100644 --- a/src/librygel-core/Makefile.am +++ b/src/librygel-core/Makefile.am @@ -75,4 +75,5 @@ EXTRA_DIST = \ $(DEPS_FILES) \ $(BUILT_SOURCES) \ RygelCore-2.6.gir \ - Rygel-2.6.gir + Rygel-2.6.gir \ + meson.build diff --git a/src/librygel-db/Makefile.am b/src/librygel-db/Makefile.am index 8914ded2..91aad52b 100644 --- a/src/librygel-db/Makefile.am +++ b/src/librygel-db/Makefile.am @@ -37,4 +37,4 @@ vapi_DATA = rygel-db-2.6.vapi rygel-db-2.6.deps rygel-db.h rygel-db-2.6.vapi: librygel_db_2_6_la_vala.stamp DISTCLEANFILES = $(nodist_typelib_DATA) -EXTRA_DIST = rygel-db.h rygel-db-2.6.vapi rygel-db-2.6.deps +EXTRA_DIST = rygel-db.h rygel-db-2.6.vapi rygel-db-2.6.deps meson.build diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am index 4919ea08..ab253235 100644 --- a/src/librygel-renderer-gst/Makefile.am +++ b/src/librygel-renderer-gst/Makefile.am @@ -61,4 +61,4 @@ endif DISTCLEANFILES = $(nodist_typelib_DATA) -EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.6.vapi rygel-renderer-gst-2.6.deps RygelRendererGst-2.6.gir Rygel-2.6.gir +EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.6.vapi rygel-renderer-gst-2.6.deps RygelRendererGst-2.6.gir Rygel-2.6.gir meson.build diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am index 407d6beb..07c9cace 100644 --- a/src/librygel-renderer/Makefile.am +++ b/src/librygel-renderer/Makefile.am @@ -57,4 +57,4 @@ nodist_typelib_DATA = $(GIRS:.gir=.typelib) endif DISTCLEANFILES = $(nodist_typelib_DATA) -EXTRA_DIST = rygel-renderer.h rygel-renderer-2.6.vapi rygel-renderer-2.6.deps RygelRenderer-2.6.gir Rygel-2.6.gir +EXTRA_DIST = rygel-renderer.h rygel-renderer-2.6.vapi rygel-renderer-2.6.deps RygelRenderer-2.6.gir Rygel-2.6.gir meson.build diff --git a/src/librygel-ruih/Makefile.am b/src/librygel-ruih/Makefile.am index 5a7d5a3b..5eeaf090 100644 --- a/src/librygel-ruih/Makefile.am +++ b/src/librygel-ruih/Makefile.am @@ -36,4 +36,4 @@ vapi_DATA = rygel-ruih-2.0.vapi rygel-ruih-2.0.deps rygel-ruih.h rygel-ruih-2.0.vapi: librygel_ruih_2_0_la_vala.stamp -EXTRA_DIST = rygel-ruih.h rygel-ruih-2.0.vapi rygel-ruih-2.0.deps +EXTRA_DIST = rygel-ruih.h rygel-ruih-2.0.vapi rygel-ruih-2.0.deps meson.build diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am index 49caa810..ff4ff0ba 100644 --- a/src/librygel-server/Makefile.am +++ b/src/librygel-server/Makefile.am @@ -63,4 +63,4 @@ nodist_typelib_DATA = $(GIRS:.gir=.typelib) endif DISTCLEANFILES = $(nodist_typelib_DATA) -EXTRA_DIST = rygel-server.h rygel-server-2.6.vapi rygel-server-2.6.deps RygelServer-2.6.gir Rygel-2.6.gir +EXTRA_DIST = rygel-server.h rygel-server-2.6.vapi rygel-server-2.6.deps RygelServer-2.6.gir Rygel-2.6.gir meson.build diff --git a/src/media-engines/Makefile.am b/src/media-engines/Makefile.am index ed2f1010..0a8ea614 100644 --- a/src/media-engines/Makefile.am +++ b/src/media-engines/Makefile.am @@ -3,3 +3,5 @@ SUBDIRS=simple if HAVE_GSTREAMER SUBDIRS += gstreamer endif + +EXTRA_DIST = meson.build diff --git a/src/media-engines/gstreamer/Makefile.am b/src/media-engines/gstreamer/Makefile.am index b5c1b3ea..c16382fc 100644 --- a/src/media-engines/gstreamer/Makefile.am +++ b/src/media-engines/gstreamer/Makefile.am @@ -39,4 +39,4 @@ librygel_media_engine_gst_la_LIBADD = \ librygel_media_engine_gst_la_LDFLAGS = \ $(RYGEL_ENGINE_LINKER_FLAGS) -EXTRA_DIST = media-engine-gst.plugin.in +EXTRA_DIST = media-engine-gst.plugin.in meson.build diff --git a/src/media-engines/simple/Makefile.am b/src/media-engines/simple/Makefile.am index c3a84c58..b6d51333 100644 --- a/src/media-engines/simple/Makefile.am +++ b/src/media-engines/simple/Makefile.am @@ -22,4 +22,4 @@ librygel_media_engine_simple_la_LIBADD = \ librygel_media_engine_simple_la_LDFLAGS = \ $(RYGEL_ENGINE_LINKER_FLAGS) -EXTRA_DIST = media-engine-simple.plugin.in +EXTRA_DIST = media-engine-simple.plugin.in meson.build diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index cae36a92..fd83e2c9 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -43,3 +43,5 @@ MAINTAINERCLEANFILES = Makefile.in vala-clean: rm -f `find . -name "*.stamp"` + +EXTRA_DIST = meson.build diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am index fa28188a..2b321f3f 100644 --- a/src/plugins/external/Makefile.am +++ b/src/plugins/external/Makefile.am @@ -29,4 +29,4 @@ librygel_external_la_LIBADD = \ librygel_external_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST=external.plugin.in +EXTRA_DIST=external.plugin.in meson.build diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am index 437c8f94..691b6a56 100644 --- a/src/plugins/gst-launch/Makefile.am +++ b/src/plugins/gst-launch/Makefile.am @@ -24,4 +24,4 @@ librygel_gst_launch_la_LIBADD = \ librygel_gst_launch_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = gst-launch.plugin.in +EXTRA_DIST = gst-launch.plugin.in meson.build diff --git a/src/plugins/lms/Makefile.am b/src/plugins/lms/Makefile.am index 7d62bfd2..34ed7be9 100644 --- a/src/plugins/lms/Makefile.am +++ b/src/plugins/lms/Makefile.am @@ -43,4 +43,4 @@ librygel_lms_la_LIBADD = \ librygel_lms_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = lms.plugin.in +EXTRA_DIST = lms.plugin.in meson.build diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am index df59e886..07db62ae 100644 --- a/src/plugins/media-export/Makefile.am +++ b/src/plugins/media-export/Makefile.am @@ -95,4 +95,4 @@ librygel_media_export_la_LIBADD = \ librygel_media_export_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = media-export.plugin.in +EXTRA_DIST = media-export.plugin.in meson.build diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am index 45211f5b..d21d1a31 100644 --- a/src/plugins/mpris/Makefile.am +++ b/src/plugins/mpris/Makefile.am @@ -23,4 +23,4 @@ librygel_mpris_la_LIBADD = \ librygel_mpris_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = mpris.plugin.in +EXTRA_DIST = mpris.plugin.in meson.build diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am index 22faaf77..b681e465 100644 --- a/src/plugins/playbin/Makefile.am +++ b/src/plugins/playbin/Makefile.am @@ -17,4 +17,4 @@ librygel_playbin_la_LIBADD = \ librygel_playbin_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = playbin.plugin.in +EXTRA_DIST = playbin.plugin.in meson.build diff --git a/src/plugins/ruih/Makefile.am b/src/plugins/ruih/Makefile.am index 25ac4441..53e41864 100644 --- a/src/plugins/ruih/Makefile.am +++ b/src/plugins/ruih/Makefile.am @@ -17,4 +17,4 @@ librygel_ruih_la_LIBADD = \ librygel_ruih_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = ruih.plugin.in +EXTRA_DIST = ruih.plugin.in meson.build diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am index d2062301..f1900a8a 100644 --- a/src/plugins/tracker/Makefile.am +++ b/src/plugins/tracker/Makefile.am @@ -54,4 +54,4 @@ librygel_tracker_la_LIBADD = \ librygel_tracker_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) -EXTRA_DIST = tracker.plugin.in +EXTRA_DIST = tracker.plugin.in meson.build diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am index deacf8d9..a25d8ec8 100644 --- a/src/rygel/Makefile.am +++ b/src/rygel/Makefile.am @@ -32,5 +32,6 @@ MAINTAINERCLEANFILES += $(BUILT_SOURCES) EXTRA_DIST = \ $(VAPI_FILES) \ $(DEPS_FILES) \ - $(BUILT_SOURCES) + $(BUILT_SOURCES) \ + meson.build diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index 4e25bdbf..15ae7586 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -28,3 +28,5 @@ rygel_preferences_LDADD = \ rygel_preferences_LDFLAGS = \ $(RYGEL_DATA_DIR_DEFINES) \ -export-dynamic + +EXTRA_DIST = meson.build diff --git a/tests/Makefile.am b/tests/Makefile.am index 280845af..08865d0d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,7 +19,7 @@ check_PROGRAMS = rygel-regression \ TESTS = $(check_PROGRAMS) -EXTRA_DIST = $(srcdir)/data/test-data.dat +EXTRA_DIST = $(srcdir)/data/test-data.dat meson.build # Define the most commonly-used flags, # to avoid repetition: @@ -46,7 +46,7 @@ test_server_libs = \ $(test_libs) \ $(LIBRYGEL_SERVER_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) - + # Note that the non-test sources here are symlinked from their # various source directories. # TODO: Mention their relative paths instead, to make this clearer? @@ -205,7 +205,7 @@ test_librygel_renderer_gst_libs = \ $(test_libs) \ $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \ $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_LIBS) - + rygel_playbin_renderer_test_SOURCES = rygel-playbin-renderer-test.vala rygel_playbin_renderer_test_VALAFLAGS = \ --enable-experimental \ -- cgit v1.2.1