2006-06-05 Carlos Garnacho <carlosg@gnome.org>

        * Makefile.am, Init/Makefile.am, Network/Makefile.am,
        Shares/Makefile.am, Time/Makefile.am, Users/Makefile.am,
        Utils/Makefile.am: distcheck fixes

8 files changed, 37 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index c1eb72d..addcd7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-06-05  Carlos Garnacho  <carlosg@gnome.org>
 
+	* Makefile.am, Init/Makefile.am, Network/Makefile.am,
+	Shares/Makefile.am, Time/Makefile.am, Users/Makefile.am,
+	Utils/Makefile.am: distcheck fixes
+
+2006-06-05  Carlos Garnacho  <carlosg@gnome.org>
+
 	* Users/Users.pm (change_user_chfn): specify which user to modify.
 	(add_user): remove a stray apostrophe.
 	* Users/Groups.pm (change_group): get the correct state for the users
diff --git a/Init/Makefile.am b/Init/Makefile.am
index 7bb5391..46e7257 100644
--- a/Init/Makefile.am
+++ b/Init/Makefile.am
@@ -1,5 +1,7 @@
-sharesdir = $(scriptsdir)/Init
+initdir = $(scriptsdir)/Init
 
-shares_SCRIPTS = \
+init_DATA = \
 	Services.pm	\
 	ServicesList.pm
+
+EXTRA_DIST = $(init_DATA)
diff --git a/Makefile.am b/Makefile.am
index d451124..68ff9d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,18 @@
 SUBDIRS = m4macros files Init Network Shares Time Users Utils
 
-scripts = \
-	SystemToolsBackends.pl	\
-	GroupsConfig.pm		\
+modules =	\
+	GroupsConfig.pm	\
 	HostsConfig.pm		\
-	IfacesConfig.pm		\
+	IfacesConfig.pm	\
 	NFSConfig.pm		\
 	NTPConfig.pm		\
 	ServicesConfig.pm	\
 	SMBConfig.pm		\
 	TimeConfig.pm		\
-	UsersConfig.pm	
+	UsersConfig.pm
+
+scripts = \
+	SystemToolsBackends.pl
 
 scripts_SCRIPTS = $(scripts)
 
@@ -18,6 +20,7 @@ EXTRA_DIST = \
 	system-tools-backends-2.0.pc.in \
 	system-tools-backends.conf.in \
 	org.freedesktop.SystemToolsBackends.service.in \
+	$(modules) \
 	README \
 	AUTHORS \
 	NEWS
diff --git a/Network/Makefile.am b/Network/Makefile.am
index 5f36923..6491dd9 100644
--- a/Network/Makefile.am
+++ b/Network/Makefile.am
@@ -1,5 +1,7 @@
-sharesdir = $(scriptsdir)/Network
+networkdir = $(scriptsdir)/Network
 
-shares_SCRIPTS = \
+network_DATA = \
 	Hosts.pm	\
 	Ifaces.pm
+
+EXTRA_DIST = $(network_DATA)
diff --git a/Shares/Makefile.am b/Shares/Makefile.am
index 2653e07..838411a 100644
--- a/Shares/Makefile.am
+++ b/Shares/Makefile.am
@@ -1,5 +1,7 @@
 sharesdir = $(scriptsdir)/Shares
 
-shares_SCRIPTS =	\
-	NFS.pm		\
+shares_DATA = \
+	NFS.pm	\
 	SMB.pm
+
+EXTRA_DIST = $(shares_DATA)
diff --git a/Time/Makefile.am b/Time/Makefile.am
index 9902cee..803fc62 100644
--- a/Time/Makefile.am
+++ b/Time/Makefile.am
@@ -1,5 +1,7 @@
 timedir = $(scriptsdir)/Time
 
-time_SCRIPTS =	\
+time_DATA = \
 	NTP.pm		\
 	TimeDate.pm
+
+EXTRA_DIST = $(time_DATA)
diff --git a/Users/Makefile.am b/Users/Makefile.am
index 1c0fdda..6ca0a61 100644
--- a/Users/Makefile.am
+++ b/Users/Makefile.am
@@ -1,6 +1,8 @@
 usersdir = $(scriptsdir)/Users
 
-users_SCRIPTS =	\
+users_DATA = \
 	Groups.pm		\
 	Shells.pm		\
 	Users.pm
+
+EXTRA_DIST = $(users_DATA)
diff --git a/Utils/Makefile.am b/Utils/Makefile.am
index 8486d8f..8975840 100644
--- a/Utils/Makefile.am
+++ b/Utils/Makefile.am
@@ -1,12 +1,14 @@
 utilsdir = $(scriptsdir)/Utils
 
-utils_SCRIPTS =	\
+utils_DATA = \
 	Backend.pm	\
 	File.pm		\
 	Monitor.pm	\
-	Parse.pm	\
+	Parse.pm		\
 	Platform.pm	\
 	Replace.pm	\
-	Report.pm	\
+	Report.pm		\
 	Util.pm		\
 	XML.pm
+
+EXTRA_DIST = $(utils_DATA)