Rename to udisks - move helpers and probers to separate subdirs

diff --git a/configure.ac b/configure.ac
index fccf842..5eee975 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,8 @@ Makefile
 data/Makefile
 data/udisks.pc
 src/Makefile
+src/helpers/Makefile
+src/probers/Makefile
 tools/Makefile
 doc/Makefile
 doc/version.xml

diff --git a/src/Makefile.am b/src/Makefile.am
index e02f105..e40e4f8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = helpers probers
+
 NULL =
 
 INCLUDES = \
@@ -88,106 +90,6 @@ udisks_daemon_LDADD =                                       \
        $(LIBATASMART_LIBS)                             \
        $(NULL)
 
-noinst_LTLIBRARIES = libpartutil.la
-libpartutil_la_SOURCES = partutil.h partutil.c
-libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
-libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
-
-libexec_PROGRAMS += udisks-helper-mkfs                                 \
-                   udisks-helper-delete-partition                      \
-                   udisks-helper-create-partition                      \
-                   udisks-helper-modify-partition                      \
-                   udisks-helper-create-partition-table                \
-                   udisks-helper-change-filesystem-label               \
-                   udisks-helper-linux-md-remove-component             \
-                   udisks-helper-fstab-mounter                         \
-                   udisks-helper-ata-smart-collect                     \
-                   udisks-helper-ata-smart-selftest                    \
-                   udisks-helper-drive-detach                          \
-                   udisks-helper-drive-poll                            \
-                   udisks-helper-linux-md-check                        \
-                   udisks-helper-drive-benchmark                       \
-                   $(NULL)
-
-libexec_SCRIPTS = udisks-helper-change-luks-password
-
-udisks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
-udisks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_mkfs_LDADD = $(GLIB_LIBS)
-
-udisks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c
-udisks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la
-
-udisks_helper_create_partition_SOURCES = job-shared.h job-create-partition.c
-udisks_helper_create_partition_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_create_partition_LDADD = $(GLIB_LIBS) libpartutil.la
-
-udisks_helper_modify_partition_SOURCES = job-shared.h job-modify-partition.c
-udisks_helper_modify_partition_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_modify_partition_LDADD = $(GLIB_LIBS) libpartutil.la
-
-udisks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c
-udisks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la
-
-udisks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c
-udisks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS)
-
-udisks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c
-udisks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
-udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
-
-udisks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c
-udisks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
-udisks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
-
-udisks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c
-udisks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_linux_md_remove_component_LDADD = $(GLIB_LIBS)
-
-udisks_helper_fstab_mounter_SOURCES = job-shared.h job-fstab-mounter.c
-udisks_helper_fstab_mounter_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_fstab_mounter_LDADD = $(GLIB_LIBS)
-
-udisks_helper_drive_detach_SOURCES = job-shared.h job-drive-detach.c
-udisks_helper_drive_detach_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS) $(SGUTILS_CFLAGS)
-udisks_helper_drive_detach_LDADD = $(LIBUDEV_LIBS) $(SGUTILS_LIBS) $(GLIB_LIBS)
-
-udisks_helper_linux_md_check_SOURCES = job-shared.h job-linux-md-check.c
-udisks_helper_linux_md_check_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_linux_md_check_LDADD = $(GLIB_LIBS)
-
-udisks_helper_drive_poll_SOURCES = job-shared.h job-drive-poll.c
-udisks_helper_drive_poll_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_drive_poll_LDADD =  $(GLIB_LIBS)
-
-udisks_helper_drive_benchmark_SOURCES = job-drive-benchmark.c
-udisks_helper_drive_benchmark_CPPFLAGS = $(AM_CPPFLAGS)
-udisks_helper_drive_benchmark_LDADD =  $(GLIB_LIBS)
-
-# TODO: move to udev
-udevhelperdir = $(slashlibdir)/udev
-udevhelper_PROGRAMS = udisks-part-id udisks-dm-export udisks-probe-ata-smart udisks-probe-sas-expander
-
-udisks_part_id_SOURCES = part-id.c
-udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
-udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
-
-udisks_dm_export_SOURCES = devkit-disks-dm-export.c
-udisks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
-udisks_dm_export_LDADD = $(DEVMAPPER_LIBS)
-
-udisks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
-udisks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
-udisks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
-
-udisks_probe_sas_expander_SOURCES = devkit-disks-probe-sas-expander.c
-udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-udisks_probe_sas_expander_LDADD = $(GLIB_LIBS)
-# end move to udev
-
 # ----------------------------------------------------------------------------------------------------
 
 polkitmodulesdir = $(libdir)/polkit-1/extensions
@@ -212,14 +114,12 @@ libudisks_action_lookup_la_LDFLAGS =                                      \
 libudisks_action_lookup_la_LIBADD =                                    \
         $(NULL)
 
-
 # ----------------------------------------------------------------------------------------------------
 
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST =                                           \
-       devkit-disks-marshal.list                       \
-       udisks-helper-change-luks-password              \
+       udisks-marshal.list                             \
        $(NULL)
 
 install-data-local:

diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
new file mode 100644 (file)
index 0000000..30d5fa7
--- /dev/null
+++ b/src/helpers/Makefile.am
@@ -0,0 +1,102 @@
+
+NULL =
+
+INCLUDES = \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
+       -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+       -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_BIN_DIR=\""$(bindir)"\" \
+       -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \
+       -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+       -DPACKAGE_LIB_DIR=\""$(libdir)"\" \
+       -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+       $(DBUS_GLIB_CFLAGS) \
+       $(POLKIT_GOBJECT_1_CFLAGS) \
+       $(GUDEV_CFLAGS) -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+       $(GLIB_CFLAGS) \
+       $(GIO_CFLAGS)
+
+libexec_PROGRAMS =                                     \
+       udisks-helper-mkfs                              \
+       udisks-helper-delete-partition                  \
+       udisks-helper-create-partition                  \
+       udisks-helper-modify-partition                  \
+       udisks-helper-create-partition-table            \
+       udisks-helper-change-filesystem-label           \
+       udisks-helper-linux-md-remove-component         \
+       udisks-helper-fstab-mounter                     \
+       udisks-helper-ata-smart-collect                 \
+       udisks-helper-ata-smart-selftest                \
+       udisks-helper-drive-detach                      \
+       udisks-helper-drive-poll                        \
+       udisks-helper-linux-md-check                    \
+       udisks-helper-drive-benchmark                   \
+       $(NULL)
+
+noinst_LTLIBRARIES = libpartutil.la
+libpartutil_la_SOURCES = partutil.h partutil.c
+libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
+libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
+
+libexec_SCRIPTS = udisks-helper-change-luks-password
+
+udisks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
+udisks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_mkfs_LDADD = $(GLIB_LIBS)
+
+udisks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c
+udisks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la
+
+udisks_helper_create_partition_SOURCES = job-shared.h job-create-partition.c
+udisks_helper_create_partition_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_create_partition_LDADD = $(GLIB_LIBS) libpartutil.la
+
+udisks_helper_modify_partition_SOURCES = job-shared.h job-modify-partition.c
+udisks_helper_modify_partition_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_modify_partition_LDADD = $(GLIB_LIBS) libpartutil.la
+
+udisks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c
+udisks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la
+
+udisks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c
+udisks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS)
+
+udisks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c
+udisks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
+udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
+
+udisks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c
+udisks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
+udisks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
+
+udisks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c
+udisks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_linux_md_remove_component_LDADD = $(GLIB_LIBS)
+
+udisks_helper_fstab_mounter_SOURCES = job-shared.h job-fstab-mounter.c
+udisks_helper_fstab_mounter_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_fstab_mounter_LDADD = $(GLIB_LIBS)
+
+udisks_helper_drive_detach_SOURCES = job-shared.h job-drive-detach.c
+udisks_helper_drive_detach_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS) $(SGUTILS_CFLAGS)
+udisks_helper_drive_detach_LDADD = $(LIBUDEV_LIBS) $(SGUTILS_LIBS) $(GLIB_LIBS)
+
+udisks_helper_linux_md_check_SOURCES = job-shared.h job-linux-md-check.c
+udisks_helper_linux_md_check_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_linux_md_check_LDADD = $(GLIB_LIBS)
+
+udisks_helper_drive_poll_SOURCES = job-shared.h job-drive-poll.c
+udisks_helper_drive_poll_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_drive_poll_LDADD =  $(GLIB_LIBS)
+
+udisks_helper_drive_benchmark_SOURCES = job-drive-benchmark.c
+udisks_helper_drive_benchmark_CPPFLAGS = $(AM_CPPFLAGS)
+udisks_helper_drive_benchmark_LDADD =  $(GLIB_LIBS)
+
+EXTRA_DIST =                                           \
+       udisks-helper-change-luks-password              \
+       $(NULL)

diff --git a/src/job-ata-smart-collect.c b/src/helpers/job-ata-smart-collect.c
similarity index 100%
rename from src/job-ata-smart-collect.c
rename to src/helpers/job-ata-smart-collect.c

diff --git a/src/job-ata-smart-selftest.c b/src/helpers/job-ata-smart-selftest.c
similarity index 100%
rename from src/job-ata-smart-selftest.c
rename to src/helpers/job-ata-smart-selftest.c

diff --git a/src/job-change-filesystem-label.c b/src/helpers/job-change-filesystem-label.c
similarity index 100%
rename from src/job-change-filesystem-label.c
rename to src/helpers/job-change-filesystem-label.c

diff --git a/src/job-create-partition-table.c b/src/helpers/job-create-partition-table.c
similarity index 100%
rename from src/job-create-partition-table.c
rename to src/helpers/job-create-partition-table.c

diff --git a/src/job-create-partition.c b/src/helpers/job-create-partition.c
similarity index 100%
rename from src/job-create-partition.c
rename to src/helpers/job-create-partition.c

diff --git a/src/job-delete-partition.c b/src/helpers/job-delete-partition.c
similarity index 100%
rename from src/job-delete-partition.c
rename to src/helpers/job-delete-partition.c

diff --git a/src/job-drive-benchmark.c b/src/helpers/job-drive-benchmark.c
similarity index 100%
rename from src/job-drive-benchmark.c
rename to src/helpers/job-drive-benchmark.c

diff --git a/src/job-drive-detach.c b/src/helpers/job-drive-detach.c
similarity index 100%
rename from src/job-drive-detach.c
rename to src/helpers/job-drive-detach.c

diff --git a/src/job-drive-poll.c b/src/helpers/job-drive-poll.c
similarity index 100%
rename from src/job-drive-poll.c
rename to src/helpers/job-drive-poll.c

diff --git a/src/job-fstab-mounter.c b/src/helpers/job-fstab-mounter.c
similarity index 100%
rename from src/job-fstab-mounter.c
rename to src/helpers/job-fstab-mounter.c

diff --git a/src/job-linux-md-check.c b/src/helpers/job-linux-md-check.c
similarity index 100%
rename from src/job-linux-md-check.c
rename to src/helpers/job-linux-md-check.c

diff --git a/src/job-linux-md-remove-component.c b/src/helpers/job-linux-md-remove-component.c
similarity index 100%
rename from src/job-linux-md-remove-component.c
rename to src/helpers/job-linux-md-remove-component.c

diff --git a/src/job-mkfs.c b/src/helpers/job-mkfs.c
similarity index 100%
rename from src/job-mkfs.c
rename to src/helpers/job-mkfs.c

diff --git a/src/job-modify-partition.c b/src/helpers/job-modify-partition.c
similarity index 100%
rename from src/job-modify-partition.c
rename to src/helpers/job-modify-partition.c

diff --git a/src/job-shared.h b/src/helpers/job-shared.h
similarity index 100%
rename from src/job-shared.h
rename to src/helpers/job-shared.h

diff --git a/src/partutil.c b/src/helpers/partutil.c
similarity index 100%
rename from src/partutil.c
rename to src/helpers/partutil.c

diff --git a/src/partutil.h b/src/helpers/partutil.h
similarity index 100%
rename from src/partutil.h
rename to src/helpers/partutil.h

diff --git a/src/udisks-helper-change-luks-password b/src/helpers/udisks-helper-change-luks-password
similarity index 100%
rename from src/udisks-helper-change-luks-password
rename to src/helpers/udisks-helper-change-luks-password

diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
new file mode 100644 (file)
index 0000000..820e481
--- /dev/null
+++ b/src/probers/Makefile.am
@@ -0,0 +1,40 @@
+
+NULL =
+
+INCLUDES = \
+       -I$(top_builddir)/src -I$(top_srcdir)/src \
+       -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+       -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_BIN_DIR=\""$(bindir)"\" \
+       -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \
+       -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+       -DPACKAGE_LIB_DIR=\""$(libdir)"\" \
+       -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+       $(DBUS_GLIB_CFLAGS) \
+       $(POLKIT_GOBJECT_1_CFLAGS) \
+       $(GUDEV_CFLAGS) -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+       $(GLIB_CFLAGS) \
+       $(GIO_CFLAGS)
+
+# TODO: ideally move most of this to udev and/or util-linux
+#
+
+udevhelperdir = $(slashlibdir)/udev
+udevhelper_PROGRAMS = udisks-part-id udisks-dm-export udisks-probe-ata-smart udisks-probe-sas-expander
+
+udisks_part_id_SOURCES = part-id.c
+udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
+udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
+
+udisks_dm_export_SOURCES = devkit-disks-dm-export.c
+udisks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
+udisks_dm_export_LDADD = $(DEVMAPPER_LIBS)
+
+udisks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
+udisks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
+udisks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
+
+udisks_probe_sas_expander_SOURCES = devkit-disks-probe-sas-expander.c
+udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+udisks_probe_sas_expander_LDADD = $(GLIB_LIBS)

diff --git a/src/devkit-disks-dm-export.c b/src/probers/devkit-disks-dm-export.c
similarity index 100%
rename from src/devkit-disks-dm-export.c
rename to src/probers/devkit-disks-dm-export.c

diff --git a/src/devkit-disks-probe-ata-smart.c b/src/probers/devkit-disks-probe-ata-smart.c
similarity index 100%
rename from src/devkit-disks-probe-ata-smart.c
rename to src/probers/devkit-disks-probe-ata-smart.c

diff --git a/src/devkit-disks-probe-sas-expander.c b/src/probers/devkit-disks-probe-sas-expander.c
similarity index 100%
rename from src/devkit-disks-probe-sas-expander.c
rename to src/probers/devkit-disks-probe-sas-expander.c

diff --git a/src/part-id.c b/src/probers/part-id.c
similarity index 99%
rename from src/part-id.c
rename to src/probers/part-id.c
index 29297db..074d1f2 100644 (file)
--- a/src/part-id.c
+++ b/src/probers/part-id.c
@@ -30,7 +30,7 @@
 #define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #include <libudev.h>
 
-#include "partutil.h"
+#include "helpers/partutil.h"
 
 static void
 usage (int argc, char *argv[])