summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--doc/Makefile.am9
-rw-r--r--doc/creating_themes/Makefile.am3
-rw-r--r--doc/man/Makefile.am4
-rw-r--r--src/Makefile.am6
-rw-r--r--src/themes/Makefile.am18
-rw-r--r--src/tools/Makefile.am4
-rw-r--r--src/wm-tester/Makefile.am3
8 files changed, 48 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index a341a411..986c1e94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,14 @@ SUBDIRS = po src doc
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-EXTRA_DIST = its autogen.sh HACKING
+EXTRA_DIST = \
+ its \
+ autogen.sh \
+ HACKING \
+ meson.build \
+ meson_options.txt \
+ meson_post_install.py \
+ po/meson.build
DISTCLEANFILES = po/stamp-it
diff --git a/doc/Makefile.am b/doc/Makefile.am
index eff56687..f63517dc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,11 @@
SUBDIRS = man creating_themes
-EXTRA_DIST=theme-format.txt marco-theme.dtd dialogs.txt code-overview.txt \
- how-to-get-focus-right.txt
+EXTRA_DIST= \
+ theme-format.txt \
+ marco-theme.dtd \
+ dialogs.txt \
+ code-overview.txt \
+ how-to-get-focus-right.txt \
+ meson.build
-include $(top_srcdir)/git.mk
diff --git a/doc/creating_themes/Makefile.am b/doc/creating_themes/Makefile.am
index e399d5f3..8aa2cc87 100644
--- a/doc/creating_themes/Makefile.am
+++ b/doc/creating_themes/Makefile.am
@@ -16,7 +16,8 @@ HELP_MEDIA =
# The names of any locales for which documentation translations exist:
HELP_LINGUAS =
-
+EXTRA_DIST= \
+ meson.build
-include $(top_srcdir)/git.mk
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index aa7c11e2..eac79446 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,6 +1,8 @@
man_MANS = marco.1 marco-theme-viewer.1 \
marco-window-demo.1 marco-message.1
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = \
+ meson.build \
+ $(man_MANS)
-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b5404d3..1e4a3984 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,14 +187,16 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmarco-private.pc
-EXTRA_DIST=$(desktopfiles_files) \
+EXTRA_DIST= \
+ $(desktopfiles_files) \
$(wmproperties_files) \
$(IMAGES) \
$(gsettings_SCHEMAS) \
$(desktopfiles_in_files) \
$(wmproperties_in_files) \
$(xml_in_files) \
- libmarco-private.pc.in
+ libmarco-private.pc.in \
+ meson.build
-include $(top_srcdir)/git.mk
diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am
index 6e8b1c98..099bbca2 100644
--- a/src/themes/Makefile.am
+++ b/src/themes/Makefile.am
@@ -18,6 +18,24 @@ THEMES= \
THEME_DIR=$(datadir)/themes
THEME_SUBDIR=metacity-1
+EXTRA_DIST= \
+ meson.build \
+ Atlanta/meson.build \
+ ClearlooksRe/meson.build \
+ Dopple/meson.build \
+ Dopple-Left/meson.build \
+ DustBlue/meson.build \
+ eOS/meson.build \
+ Esco/meson.build \
+ Gorilla/meson.build \
+ Motif/meson.build \
+ Raleigh/meson.build \
+ Spidey/meson.build \
+ Spidey-Left/meson.build \
+ Splint/meson.build \
+ Splint-Left/meson.build \
+ WinMe/meson.build
+
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(THEME_DIR); \
for THEME in $(THEMES); do \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index d88f571f..cfbbedc1 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -19,7 +19,9 @@ bin_PROGRAMS=marco-message marco-window-demo
marco_message_LDADD= @MARCO_MESSAGE_LIBS@
marco_window_demo_LDADD= @MARCO_WINDOW_DEMO_LIBS@
-EXTRA_DIST=$(icon_DATA)
+EXTRA_DIST= \
+ meson.build \
+ $(icon_DATA)
-include $(top_srcdir)/git.mk
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index 8383556f..d4224393 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -26,4 +26,7 @@ test_resizing_LDADD= @MARCO_LIBS@
test_size_hints_LDADD= @MARCO_LIBS@
focus_window_LDADD= @MARCO_LIBS@
+EXTRA_DIST= \
+ meson.build
+
-include $(top_srcdir)/git.mk