[gtkmm-documentation/gtkmm-3-24] Makefile.am: Distribute files needed when building with Meson



commit 428ac65ec3ecc2e11ed90c88794919471b25d176
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Oct 4 13:50:23 2019 +0200

    Makefile.am: Distribute files needed when building with Meson

 Makefile.am                        | 17 +++++++++++++++++
 README                             | 10 ++++++----
 examples/book/buildapp/Makefile.am | 13 +++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f907975..09b102d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,5 +8,22 @@ SUBDIRS = examples docs/tutorial
 dist_noinst_DATA = COPYING.examples
 dist_noinst_SCRIPTS = autogen.sh
 
+# Distribute files needed when building with Meson.
+EXTRA_DIST = \
+  meson.build \
+  meson_options.txt \
+  docs/tutorial/meson.build \
+  docs/tutorial/LINGUAS \
+  examples/meson.build \
+  examples/book/meson.build \
+  examples/book/buildapp/meson.build \
+  examples/book/giomm/meson.build \
+  examples/book/treeview/meson.build \
+  examples/others/meson.build \
+  tools/meson_aux/compile-schemas.py \
+  tools/meson_aux/copy-to-subdir.py \
+  tools/meson_aux/extra-dist-cmd.py \
+  tools/meson_aux/tutorial-custom-cmd.py
+
 # Auto-generate the ChangeLog file from the git log on make dist
 include $(top_srcdir)/build/dist-changelog.am
diff --git a/README b/README
index 95d1df1..9a60909 100644
--- a/README
+++ b/README
@@ -1,13 +1,16 @@
 This is the documentation for gtkmm, a C++ API for GTK+.
 See http://www.gtkmm.org/
 
-Building with meson
+gtkmm-documentation can be built with Autotools or Meson.
+Building with Autotools may be phased out in the future.
+
+Building with Meson
 -------------------
 Create a build directory:
   $ cd gtkmm-3-documentation
   $ meson [options] <build-dir>
 Do not call the build-dir gtkmm-3-documentation/build. There is already such a
-directory, used when building with autotools.
+directory, used when building with Autotools.
 
 Print a list of configuration options:
   $ cd <build-dir>
@@ -47,5 +50,4 @@ have previously run 'ninja' and 'ninja install' with build-translations=true.
 
 This tarball is not identical to one made with "make dist" or "make distcheck".
 There is e.g. no "configure" file. If you want to use a tarball made with
-"ninja dist" for building with autotools, you have to start with ./autogen.sh.
-"make dist" and "make distcheck" don't distribute the meson.build files.
+"ninja dist" for building with Autotools, you have to start with ./autogen.sh.
diff --git a/examples/book/buildapp/Makefile.am b/examples/book/buildapp/Makefile.am
index 494e274..35e7b5f 100644
--- a/examples/book/buildapp/Makefile.am
+++ b/examples/book/buildapp/Makefile.am
@@ -42,6 +42,19 @@ dist_noinst_DATA = \
   step9/Makefile.example \
   $(gsettings_SCHEMAS)
 
+# Distribute files needed when building with Meson.
+EXTRA_DIST = \
+  step1/install-cmd.py \
+  step1/meson.build \
+  step2/meson.build \
+  step3/meson.build \
+  step4/meson.build \
+  step5/meson.build \
+  step6/meson.build \
+  step7/meson.build \
+  step8/meson.build \
+  step9/meson.build
+
 step1_exampleapp_SOURCES = \
   step1/exampleapplication.cc \
   step1/exampleapplication.h \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]