From 24b891b394e63908d23b97c2d48edc1be219b521 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 19 Jun 2017 22:00:52 -0500 Subject: [PATCH] Add meson build files to Makefile.am Fix typo --- Makefile.am | 4 +++- atspi/Makefile.am | 3 ++- bus/Makefile.am | 3 ++- dbind/Makefile.am | 3 +++ registryd/Makefile.am | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 48c87df..dff484a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,9 @@ SUBDIRS = po dbind xml atspi bus registryd doc test ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} EXTRA_DIST = \ - atspi-2.pc.in + atspi-2.pc.in \ + meson.build \ + meson_options.txt pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atspi-2.pc diff --git a/atspi/Makefile.am b/atspi/Makefile.am index f6c45fa..40dcdb3 100644 --- a/atspi/Makefile.am +++ b/atspi/Makefile.am @@ -4,7 +4,8 @@ BUILT_SOURCES = CLEANFILES = DISTCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = \ + meson.build lib_LTLIBRARIES += libatspi.la diff --git a/bus/Makefile.am b/bus/Makefile.am index d5250dc..688f82a 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -1,6 +1,7 @@ CLEANFILES = DISTCLEANFILES = -EXTRA_DIST = +EXTRA_DIST = \ + meson.build libexec_PROGRAMS = at-spi-bus-launcher at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c diff --git a/dbind/Makefile.am b/dbind/Makefile.am index 201570a..6594e3e 100644 --- a/dbind/Makefile.am +++ b/dbind/Makefile.am @@ -21,4 +21,7 @@ dbtest_SOURCES = dbtest.c ../atspi/atspi-gmain.c dbtest_LDFLAGS = libdbind.la dbtest_LDADD = $(DBUS_LIBS) +EXTRA_DIST = \ + meson.build + -include $(top_srcdir)/git.mk diff --git a/registryd/Makefile.am b/registryd/Makefile.am index b30d185..6da1a78 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -1,4 +1,5 @@ -EXTRA_DIST = +EXTRA_DIST = \ + meson.build libexec_PROGRAMS = at-spi2-registryd -- 2.7.4