Move data files into a separate directory

diff --git a/Makefile.am b/Makefile.am
index 0e340c2..d9a028f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src doc tools policy po
+SUBDIRS = data src doc tools policy po
 
 # Creating ChangeLog from git log (taken from cairo/Makefile.am):
 ChangeLog: $(srcdir)/ChangeLog
@@ -19,12 +19,8 @@ $(srcdir)/ChangeLog:
          echo A git checkout and git-log is required to generate this file >> $@); \
        fi
 
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = DeviceKit-disks.pc
-
 EXTRA_DIST =                   \
        HACKING                 \
-       DeviceKit-disks.pc.in   \
        ChangeLog
 
 # xsltproc barfs on 'make distcheck'; disable for now

diff --git a/configure.ac b/configure.ac
index 7eda27b..cdd2f4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -203,8 +203,9 @@ AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 
 AC_OUTPUT([
-DeviceKit-disks.pc
 Makefile
+data/Makefile
+data/DeviceKit-disks.pc
 src/Makefile
 tools/Makefile
 doc/Makefile

diff --git a/src/95-devkit-disks.rules b/data/95-devkit-disks.rules
similarity index 100%
rename from src/95-devkit-disks.rules
rename to data/95-devkit-disks.rules

diff --git a/DeviceKit-disks.pc.in b/data/DeviceKit-disks.pc.in
similarity index 100%
rename from DeviceKit-disks.pc.in
rename to data/DeviceKit-disks.pc.in

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644 (file)
index 0000000..db5a6b9
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,37 @@
+
+NULL =
+
+dbusifdir = $(datadir)/dbus-1/interfaces
+dbusif_DATA = org.freedesktop.DeviceKit.Disks.xml org.freedesktop.DeviceKit.Disks.Device.xml
+
+servicedir       = $(datadir)/dbus-1/system-services
+service_in_files = org.freedesktop.DeviceKit.Disks.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+       @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+dbusconfdir = $(sysconfdir)/dbus-1/system.d
+dbusconf_in_files = org.freedesktop.DeviceKit.Disks.conf.in
+dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
+
+$(dbusconf_DATA): $(dbusconf_in_files) Makefile
+       cp $< $@
+
+udevrulesdir = $(slashlibdir)/udev/rules.d
+udevrules_DATA = 95-devkit-disks.rules
+
+pkgconfigdir = $(datadir)/pkgconfig
+pkgconfig_DATA = DeviceKit-disks.pc
+
+EXTRA_DIST =                                           \
+       org.freedesktop.DeviceKit.Disks.xml             \
+       org.freedesktop.DeviceKit.Disks.Device.xml      \
+       95-devkit-disks.rules                           \
+       $(service_in_files)                             \
+       $(dbusconf_in_files)                            \
+       DeviceKit-disks.pc.in                           \
+       $(NULL)
+
+clean-local :
+       rm -f *~ $(service_DATA) $(dbusconf_DATA)

diff --git a/src/org.freedesktop.DeviceKit.Disks.Device.xml b/data/org.freedesktop.DeviceKit.Disks.Device.xml
similarity index 100%
rename from src/org.freedesktop.DeviceKit.Disks.Device.xml
rename to data/org.freedesktop.DeviceKit.Disks.Device.xml

diff --git a/src/org.freedesktop.DeviceKit.Disks.conf.in b/data/org.freedesktop.DeviceKit.Disks.conf.in
similarity index 100%
rename from src/org.freedesktop.DeviceKit.Disks.conf.in
rename to data/org.freedesktop.DeviceKit.Disks.conf.in

diff --git a/src/org.freedesktop.DeviceKit.Disks.service.in b/data/org.freedesktop.DeviceKit.Disks.service.in
similarity index 100%
rename from src/org.freedesktop.DeviceKit.Disks.service.in
rename to data/org.freedesktop.DeviceKit.Disks.service.in

diff --git a/src/org.freedesktop.DeviceKit.Disks.xml b/data/org.freedesktop.DeviceKit.Disks.xml
similarity index 100%
rename from src/org.freedesktop.DeviceKit.Disks.xml
rename to data/org.freedesktop.DeviceKit.Disks.xml

diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index a2fd7ef..73cf298 100644 (file)
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,11 +1,11 @@
 
 all : org.freedesktop.DeviceKit.Disks.ref.xml org.freedesktop.DeviceKit.Disks.Device.ref.xml
 
-org.freedesktop.DeviceKit.Disks.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.DeviceKit.Disks.ref.xml : $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
        echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
        $(XSLTPROC) -nonet $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-org.freedesktop.DeviceKit.Disks.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.DeviceKit.Disks.Device.ref.xml : $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
        echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
        $(XSLTPROC) -nonet $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 

diff --git a/src/Makefile.am b/src/Makefile.am
index b5ae6cd..1c5ff99 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,17 +29,14 @@ devkit-disks-marshal.h: devkit-disks-marshal.list
 devkit-disks-marshal.c: devkit-disks-marshal.list
        echo "#include \"devkit-disks-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_disks_marshal --body >> $@
 
-devkit-disks-daemon-glue.h: org.freedesktop.DeviceKit.Disks.xml Makefile.am
-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-server --output=devkit-disks-daemon-glue.h org.freedesktop.DeviceKit.Disks.xml
+devkit-disks-daemon-glue.h: $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.xml Makefile.am
+       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-server --output=devkit-disks-daemon-glue.h $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.xml
 
-devkit-disks-device-glue.h: org.freedesktop.DeviceKit.Disks.Device.xml Makefile.am
-       dbus-binding-tool --prefix=devkit_disks_device --mode=glib-server --output=devkit-disks-device-glue.h org.freedesktop.DeviceKit.Disks.Device.xml
+devkit-disks-device-glue.h: $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.Device.xml Makefile.am
+       dbus-binding-tool --prefix=devkit_disks_device --mode=glib-server --output=devkit-disks-device-glue.h $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.Device.xml
 
 libexec_PROGRAMS = devkit-disks-daemon
 
-dbusifdir = $(datadir)/dbus-1/interfaces
-dbusif_DATA = org.freedesktop.DeviceKit.Disks.xml org.freedesktop.DeviceKit.Disks.Device.xml
-
 devkit_disks_daemon_SOURCES =                                          \
        devkit-disks-types.h                                            \
        devkit-disks-private.h                                          \
@@ -174,24 +171,6 @@ devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
 devkit_disks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
 # end move to udev
 
-
-servicedir       = $(datadir)/dbus-1/system-services
-service_in_files = org.freedesktop.DeviceKit.Disks.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-       @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-dbusconfdir = $(sysconfdir)/dbus-1/system.d
-dbusconf_in_files = org.freedesktop.DeviceKit.Disks.conf.in
-dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
-
-$(dbusconf_DATA): $(dbusconf_in_files) Makefile
-       cp $< $@
-
-udevrulesdir = $(slashlibdir)/udev/rules.d
-udevrules_DATA = 95-devkit-disks.rules
-
 # ----------------------------------------------------------------------------------------------------
 
 polkitmodulesdir = $(libdir)/polkit-1/extensions
@@ -221,16 +200,10 @@ libdevkit_disks_action_lookup_la_LIBADD =                                 \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = org.freedesktop.DeviceKit.Disks.xml        \
-            org.freedesktop.DeviceKit.Disks.Device.xml \
-            devkit-disks-marshal.list                  \
-            95-devkit-disks.rules                      \
-            devkit-disks-helper-change-luks-password   \
-            $(service_in_files)                        \
-            $(dbusconf_in_files)
-
-clean-local :
-       rm -f *~ $(service_DATA) $(dbusconf_DATA)
+EXTRA_DIST =                                           \
+       devkit-disks-marshal.list                       \
+       devkit-disks-helper-change-luks-password        \
+       $(NULL)
 
 install-data-local:
        -$(mkdir_p) $(DESTDIR)$(localstatedir)/lib/DeviceKit-disks

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0b18fa3..a14791f 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,11 +25,11 @@ devkit-disks-marshal.h: $(top_srcdir)/src/devkit-disks-marshal.list
 devkit-disks-marshal.c: $(top_srcdir)/src/devkit-disks-marshal.list
        echo "#include \"devkit-disks-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_disks_marshal --body >> $@
 
-devkit-disks-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.xml Makefile.am
-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-daemon-glue.h $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.xml
+devkit-disks-daemon-glue.h: $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.xml Makefile.am
+       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-daemon-glue.h $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.xml
 
-devkit-disks-device-glue.h: $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.Device.xml Makefile.am
-       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-device-glue.h $(top_srcdir)/src/org.freedesktop.DeviceKit.Disks.Device.xml
+devkit-disks-device-glue.h: $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.Device.xml Makefile.am
+       dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-device-glue.h $(top_srcdir)/data/org.freedesktop.DeviceKit.Disks.Device.xml
 
 bin_PROGRAMS = devkit-disks