build: setup all data (polkit, icon, dbus...) in the same `data' directory

Also fixed dist when not using polkit, the icon was no longer included in the
tarball.

Makefile.am

@@ -1,40 +1,4 @@
-
-SUBDIRS = . marshallers build-aux include libmm-common libqcdm libwmc src plugins introspection po test docs
-
-if WITH_POLKIT
-SUBDIRS += policy
-endif
-
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = org.freedesktop.ModemManager.conf
-
-dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
-dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
-
-if WITH_POLKIT
-org.freedesktop.ModemManager.conf: $(top_srcdir)/$(dbusservice_file_polkit)
-	cp -f $(top_srcdir)/$(dbusservice_file_polkit) $(dbusservice_DATA)
-else
-org.freedesktop.ModemManager.conf: $(top_srcdir)/$(dbusservice_file_nopolkit)
-	cp -f $(top_srcdir)/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
-endif
-
-dbusactivationdir = $(datadir)/dbus-1/system-services
-dbusactivation_in_files = org.freedesktop.ModemManager.service.in
-dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
-
-%service: %service.in
-	$(edit) $< >$@
-
-XMLS = $(wildcard introspection/*.xml)
-xmldir = $(datadir)/dbus-1/interfaces
-xml_DATA = $(filter-out introspection/all.xml introspection/org.freedesktop.DBus.Properties.xml, $(XMLS))
-
-edit = @sed \
-	-e 's|@sbindir[@]|$(sbindir)|g' \
-	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-	-e 's|@localstatedir[@]|$(localstatedir)|g' \
-	-e 's|@libexecdir[@]|$(libexecdir)|g'
+SUBDIRS = . marshallers build-aux data include libmm-common libqcdm libwmc src plugins introspection po test docs
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udev-base-dir="$$dc_install_base" \
@@ -47,17 +11,12 @@ INTLTOOL_FILES = \
 	intltool-update.in
 
 DISTCLEANFILES = \
-	$(dbusactivation_DATA) \
-	$(dbusservice_DATA) \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
 	po/.intltool-merge-cache
 
 EXTRA_DIST = \
-	$(dbusactivation_in_files) \
-	$(INTLTOOL_FILES) \
-	$(dbusservice_file_polkit) \
-	$(dbusservice_file_nopolkit)
+	$(INTLTOOL_FILES)
 
 ACLOCAL_AMFLAGS = -I m4

configure.ac

@@ -173,6 +173,7 @@ AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "no")
 AC_CONFIG_FILES([
 Makefile
 marshallers/Makefile
+data/Makefile
 include/Makefile
 build-aux/Makefile
 libmm-common/Makefile
@@ -188,7 +189,6 @@ plugins/Makefile
 test/Makefile
 introspection/Makefile
 po/Makefile.in
-policy/Makefile
 docs/Makefile
 docs/man/Makefile
 docs/man/modem-manager.8

data/Makefile.am

@@ -0,0 +1,60 @@
+
+# DBus Service file
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = org.freedesktop.ModemManager.conf
+dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
+dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
+
+if WITH_POLKIT
+org.freedesktop.ModemManager.conf: $(top_srcdir)/data/$(dbusservice_file_polkit)
+	cp -f $(top_srcdir)/data/$(dbusservice_file_polkit) $(dbusservice_DATA)
+else
+org.freedesktop.ModemManager.conf:  $(top_srcdir)/data/$(dbusservice_file_nopolkit)
+	cp -f $(top_srcdir)/data/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
+endif
+
+
+# DBus Activation file
+edit = @sed \
+       -e 's|@sbindir[@]|$(sbindir)|g' \
+       -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+       -e 's|@localstatedir[@]|$(localstatedir)|g' \
+       -e 's|@libexecdir[@]|$(libexecdir)|g'
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.ModemManager.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+%service: %service.in
+	$(edit) $< >$@
+
+
+# DBus Introspection files
+XMLS = $(wildcard $(top_srcdir)/introspection/*.xml)
+xmldir = $(datadir)/dbus-1/interfaces
+xml_DATA = $(filter-out $(top_srcdir)/introspection/all.xml, $(XMLS))
+
+
+# Icon
+icondir=${datadir}/icons/hicolor/22x22/apps
+icon_DATA = modem-manager.png
+
+
+# Polkit
+dist_polkit_policy_in_files = org.freedesktop.modem-manager.policy.in
+if WITH_POLKIT
+polkit_policydir = $(datadir)/polkit-1/actions
+dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
+@INTLTOOL_POLICY_RULE@
+endif
+
+
+DISTCLEANFILES = \
+	$(dbusactivation_DATA) \
+	$(dbusservice_DATA)
+
+EXTRA_DIST = \
+	$(dbusactivation_in_files) \
+	$(dbusservice_file_polkit) \
+	$(dbusservice_file_nopolkit) \
+	$(icon_DATA) \
+	$(dist_polkit_policy_in_files)
+

policy/Makefile.am

@@ -1,15 +0,0 @@
-icondir=${datadir}/icons/hicolor/22x22/apps
-icon_DATA = modem-manager.png
-
-polkit_policydir = $(datadir)/polkit-1/actions
-
-dist_polkit_policy_in_files = org.freedesktop.modem-manager.policy.in
-dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
-
-@INTLTOOL_POLICY_RULE@
-
-clean-local :
-	rm -f *~
-
-EXTRA_DIST = $(dist_polkit_policy_in_files) $(icon_DATA)
-