use better syntax for files that need disting

diff --git a/data/Makefile.am b/data/Makefile.am
index d8a7a03539558e64aed2b359413be8b317c57bc1..b07dce294bea717bc0b1799c49034ce54780d269 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,14 +1,12 @@
 SUBDIRS = init
 
 confdir = $(sysconfdir)
-conf_DATA = lightdm.conf
+dist_conf_DATA = lightdm.conf
 
 dbusconfdir = $(DBUS_SYS_DIR)
-dbusconf_DATA = org.lightdm.LightDisplayManager.conf
+dist_dbusconf_DATA = org.lightdm.LightDisplayManager.conf
 
-man1_MANS = lightdm.1
-
-EXTRA_DIST = $(conf_DATA) $(dbusconf_DATA) $(man1_MANS)
+dist_man1_MANS = lightdm.1
 
 DISTCLEANFILES = \
        Makefile.in

diff --git a/data/init/Makefile.am b/data/init/Makefile.am
index 7c11da2af53adb483e4a9858ce8b736e3f2c01e3..5383af38409860f9360af1fb04fbcba4baeaef29 100644 (file)
--- a/data/init/Makefile.am
+++ b/data/init/Makefile.am
@@ -1,7 +1,5 @@
 initdir = ${sysconfdir}/init
-init_DATA = lightdm.conf
-
-EXTRA_DIST = $(init_DATA)
+dist_init_DATA = lightdm.conf
 
 DISTCLEANFILES = \
        Makefile.in

diff --git a/greeters/python-gtk/Makefile.am b/greeters/python-gtk/Makefile.am
index 97b089991fee68ab7493865cf731ac8f216e1053..e48046eb529d88dd5ca041d0b61f0dc1ce20e4a8 100644 (file)
--- a/greeters/python-gtk/Makefile.am
+++ b/greeters/python-gtk/Makefile.am
@@ -1,3 +1 @@
-libexec_SCRIPTS = lightdm-python-gtk-greeter
-
-EXTRA_DIST = lightdm-python-gtk-greeter
+dist_libexec_SCRIPTS = lightdm-python-gtk-greeter

diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
index 608e170915dfe5cc74642b7a3efda28a3298e1fc..ac2adad2ac8ddbe10096e1ea6e0e7705019e8006 100644 (file)
--- a/liblightdm-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -47,14 +47,11 @@ typelib_DATA = LightDM-0.typelib
 endif
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = lightdm-0.vapi
+dist_vapi_DATA = lightdm-0.vapi
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liblightdm-gobject-0.pc
 
-EXTRA_DIST = \
-       $(vapi_DATA)
-
 DISTCLEANFILES = \
        Makefile.in \
        $(pkgconfig_DATA) \

diff --git a/themes/example-gtk-gnome/Makefile.am b/themes/example-gtk-gnome/Makefile.am
index 80d4424fe8560d026159697671c3ae44fd898c39..b325fad725f49ce0308b64f4d5cfe214e0f266ba 100644 (file)
--- a/themes/example-gtk-gnome/Makefile.am
+++ b/themes/example-gtk-gnome/Makefile.am
@@ -1,7 +1,5 @@
 themedir = $(THEME_DIR)/example-gtk-gnome
-theme_DATA = index.theme gtkrc bg.jpg
-
-EXTRA_DIST = $(theme_DATA)
+dist_theme_DATA = index.theme gtkrc bg.jpg
 
 DISTCLEANFILES = \
        Makefile.in

diff --git a/themes/example-python-gtk-gnome/Makefile.am b/themes/example-python-gtk-gnome/Makefile.am
index 2b3d840e5e5e9662667e5c9322daf7920b0f0356..27c6ffdcc58c7fbd10780bab8852ee68ddb2a3cb 100644 (file)
--- a/themes/example-python-gtk-gnome/Makefile.am
+++ b/themes/example-python-gtk-gnome/Makefile.am
@@ -1,7 +1,5 @@
 themedir = $(THEME_DIR)/example-python-gtk-gnome
-theme_DATA = index.theme gtkrc bg.jpg
-
-EXTRA_DIST = $(theme_DATA)
+dist_theme_DATA = index.theme gtkrc bg.jpg
 
 DISTCLEANFILES = \
        Makefile.in

diff --git a/themes/example-qt-kde/Makefile.am b/themes/example-qt-kde/Makefile.am
index 88766e291495f3375a069833920101abda51c6bc..210028a86d2479f9c4573a9676dd6a1624809e9d 100644 (file)
--- a/themes/example-qt-kde/Makefile.am
+++ b/themes/example-qt-kde/Makefile.am
@@ -1,7 +1,5 @@
 themedir = $(THEME_DIR)/example-qt-kde
-theme_DATA = index.theme
-
-EXTRA_DIST = $(theme_DATA)
+dist_theme_DATA = index.theme
 
 DISTCLEANFILES = \
        Makefile.in

diff --git a/themes/example-vala-gtk-gnome/Makefile.am b/themes/example-vala-gtk-gnome/Makefile.am
index 2fe668e2e8f28680fe591e8fe09cbaaaf64d476b..e2842b39e5af473588e47ae7be111594d589185f 100644 (file)
--- a/themes/example-vala-gtk-gnome/Makefile.am
+++ b/themes/example-vala-gtk-gnome/Makefile.am
@@ -1,7 +1,5 @@
 themedir = $(THEME_DIR)/example-vala-gtk-gnome
-theme_DATA = index.theme gtkrc bg.jpg
-
-EXTRA_DIST = $(theme_DATA)
+dist_theme_DATA = index.theme gtkrc bg.jpg
 
 DISTCLEANFILES = \
        Makefile.in