From 1596519d3c103d60c6870d80f3355a1987ce37e6 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Thu, 12 Apr 2012 03:45:37 -0400 Subject: [PATCH] Split libgdu out of gnome-disk-utility --- Makefile.am | 2 +- configure.ac | 16 +------------- data/Makefile.am | 11 ---------- data/icons/16x16/Makefile.am | 37 ------------------------------------ data/icons/22x22/Makefile.am | 37 ------------------------------------ data/icons/48x48/Makefile.am | 37 ------------------------------------ data/icons/scalable/Makefile.am | 37 ------------------------------------ src/Makefile.am | 2 +- src/format-tool/Makefile.am | 4 +- src/nautilus-extension/Makefile.am | 4 +- src/palimpsest/Makefile.am | 4 +- 11 files changed, 10 insertions(+), 181 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4fd5718..2745725 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = src data doc help po +SUBDIRS = src data help po EXTRA_DIST = \ autogen.sh \ diff --git a/configure.ac b/configure.ac index 77a16ab..9b351f3 100644 --- a/configure.ac +++ b/configure.ac @@ -132,10 +132,7 @@ GTK3_REQUIRED=2.90.7 UNIQUE_REQUIRED=2.90.1 LIBNOTIFY_REQUIRED=0.6.1 NAUTILUS_REQUIRED=2.91.0 -AVAHI_UI_REQUIRED=0.6.25 - -UDISKS_REQUIRED=1.0.0 -UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 +GDU_REQUIRED=3.0.2 SCROLLKEEPER_REQUIRED=0.3.14 INTLTOOL_REQUIRED=0.35.0 @@ -149,10 +146,8 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED]) PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) -PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) PKG_CHECK_MODULES(X11, [x11]) -PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) -PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED]) +PKG_CHECK_MODULES(GDU, [gdu >= $GDU_REQUIRED gdu-gtk >= $GDU_REQUIRED]) # ************* # Remote Access @@ -238,12 +233,7 @@ AC_SUBST([AM_LDFLAGS]) AC_CONFIG_FILES([ Makefile src/Makefile -src/gdu/Makefile -src/gdu/gdu.pc -src/gdu-gtk/Makefile -src/gdu-gtk/gdu-gtk.pc src/palimpsest/Makefile -src/notification/Makefile src/format-tool/Makefile src/nautilus-extension/Makefile po/Makefile.in @@ -258,8 +248,6 @@ data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/scalable/Makefile help/Makefile -doc/Makefile -doc/version.xml ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 785368d..0232908 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,27 +6,16 @@ desktopdir = $(datadir)/applications desktop_in_files = palimpsest.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -autostartdir = $(sysconfdir)/xdg/autostart -autostart_in_files = gdu-notification-daemon.desktop.in -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) - -gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in - @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ - @INTLTOOL_DESKTOP_RULE@ distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper EXTRA_DIST = \ $(desktop_in_files) \ - $(autostart_in_files) \ $(NULL) CLEANFILES = \ $(desktop_DATA) \ - $(autostart_DATA) \ - gdu-notification-daemon.desktop.in \ - gdu-notification-daemon.desktop.in.in \ $(NULL) clean-local : diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index f62ef2d..25db659 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -3,43 +3,6 @@ NULL = icondir = $(datadir)/icons/hicolor/16x16/apps icon_DATA = \ palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ - gdu-unmount.png \ - gdu-raid-array.png \ - gdu-raid-array-start.png \ - gdu-raid-array-stop.png \ - gdu-encrypted-lock.png \ - gdu-encrypted-unlock.png \ - gdu-smart-failing.png \ - gdu-smart-threshold.png \ - gdu-smart-healthy.png \ - gdu-smart-unknown.png \ - gdu-check-disk.png \ - gdu-info.png \ - gdu-error.png \ - gdu-warning.png \ - gdu-unmountable.png \ - nautilus-gdu.png \ - gdu-multidisk-drive.png \ - gdu-hba.png \ - gdu-expander.png \ - gdu-category-multidisk.png \ - gdu-category-multipath.png \ - gdu-category-peripheral.png \ - gdu-emblem-mp.png \ - gdu-emblem-mp-component.png \ - gdu-emblem-lvm-vg.png \ - gdu-emblem-lvm-lv.png \ - gdu-emblem-raid-linear.png \ - gdu-emblem-raid0.png \ - gdu-emblem-raid1.png \ - gdu-emblem-raid3.png \ - gdu-emblem-raid4.png \ - gdu-emblem-raid5.png \ - gdu-emblem-raid6.png \ - gdu-emblem-raid10.png \ $(NULL) EXTRA_DIST = \ diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index c0b4c4d..510b976 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -3,43 +3,6 @@ NULL = icondir = $(datadir)/icons/hicolor/22x22/apps icon_DATA = \ palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ - gdu-unmount.png \ - gdu-raid-array.png \ - gdu-raid-array-start.png \ - gdu-raid-array-stop.png \ - gdu-encrypted-lock.png \ - gdu-encrypted-unlock.png \ - gdu-smart-failing.png \ - gdu-smart-threshold.png \ - gdu-smart-healthy.png \ - gdu-smart-unknown.png \ - gdu-check-disk.png \ - gdu-info.png \ - gdu-error.png \ - gdu-warning.png \ - gdu-unmountable.png \ - nautilus-gdu.png \ - gdu-multidisk-drive.png \ - gdu-hba.png \ - gdu-expander.png \ - gdu-category-multidisk.png \ - gdu-category-multipath.png \ - gdu-category-peripheral.png \ - gdu-emblem-mp.png \ - gdu-emblem-mp-component.png \ - gdu-emblem-lvm-vg.png \ - gdu-emblem-lvm-lv.png \ - gdu-emblem-raid-linear.png \ - gdu-emblem-raid0.png \ - gdu-emblem-raid1.png \ - gdu-emblem-raid3.png \ - gdu-emblem-raid4.png \ - gdu-emblem-raid5.png \ - gdu-emblem-raid6.png \ - gdu-emblem-raid10.png \ $(NULL) EXTRA_DIST = \ diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am index 349b8ce..ad38bea 100644 --- a/data/icons/48x48/Makefile.am +++ b/data/icons/48x48/Makefile.am @@ -3,43 +3,6 @@ NULL = icondir = $(datadir)/icons/hicolor/48x48/apps icon_DATA = \ palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ - gdu-unmount.png \ - gdu-raid-array.png \ - gdu-raid-array-start.png \ - gdu-raid-array-stop.png \ - gdu-encrypted-lock.png \ - gdu-encrypted-unlock.png \ - gdu-smart-failing.png \ - gdu-smart-threshold.png \ - gdu-smart-healthy.png \ - gdu-smart-unknown.png \ - gdu-check-disk.png \ - gdu-info.png \ - gdu-error.png \ - gdu-warning.png \ - gdu-unmountable.png \ - nautilus-gdu.png \ - gdu-multidisk-drive.png \ - gdu-hba.png \ - gdu-expander.png \ - gdu-category-multidisk.png \ - gdu-category-multipath.png \ - gdu-category-peripheral.png \ - gdu-emblem-mp.png \ - gdu-emblem-mp-component.png \ - gdu-emblem-lvm-vg.png \ - gdu-emblem-lvm-lv.png \ - gdu-emblem-raid-linear.png \ - gdu-emblem-raid0.png \ - gdu-emblem-raid1.png \ - gdu-emblem-raid3.png \ - gdu-emblem-raid4.png \ - gdu-emblem-raid5.png \ - gdu-emblem-raid6.png \ - gdu-emblem-raid10.png \ $(NULL) EXTRA_DIST = \ diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index bc3f60f..3bbcecd 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -2,43 +2,6 @@ NULL = icondir = $(datadir)/icons/hicolor/scalable/apps icon_DATA = \ - gdu-eject.svg \ - gdu-detach.svg \ - gdu-mount.svg \ - gdu-unmount.svg \ - gdu-raid-array.svg \ - gdu-raid-array-start.svg \ - gdu-raid-array-stop.svg \ - gdu-encrypted-lock.svg \ - gdu-encrypted-unlock.svg \ - gdu-smart-failing.svg \ - gdu-smart-threshold.svg \ - gdu-smart-healthy.svg \ - gdu-smart-unknown.svg \ - gdu-check-disk.svg \ - gdu-info.svg \ - gdu-error.svg \ - gdu-warning.svg \ - gdu-unmountable.svg \ - nautilus-gdu.svg \ - gdu-multidisk-drive.svg \ - gdu-hba.svg \ - gdu-expander.svg \ - gdu-category-multidisk.svg \ - gdu-category-multipath.svg \ - gdu-category-peripheral.svg \ - gdu-emblem-mp.svg \ - gdu-emblem-mp-component.svg \ - gdu-emblem-lvm-vg.svg \ - gdu-emblem-lvm-lv.svg \ - gdu-emblem-raid-linear.svg \ - gdu-emblem-raid0.svg \ - gdu-emblem-raid1.svg \ - gdu-emblem-raid3.svg \ - gdu-emblem-raid4.svg \ - gdu-emblem-raid5.svg \ - gdu-emblem-raid6.svg \ - gdu-emblem-raid10.svg \ $(NULL) EXTRA_DIST = \ diff --git a/src/Makefile.am b/src/Makefile.am index bab902f..0d47f52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = gdu gdu-gtk palimpsest notification format-tool +SUBDIRS = palimpsest format-tool if ENABLE_NAUTILUS SUBDIRS += nautilus-extension diff --git a/src/format-tool/Makefile.am b/src/format-tool/Makefile.am index 4573770..e95d998 100644 --- a/src/format-tool/Makefile.am +++ b/src/format-tool/Makefile.am @@ -18,6 +18,7 @@ CORE_CFLAGS = \ $(GIO_UNIX2_CFLAGS) \ $(GTHREAD2_CFLAGS) \ $(GTK3_CFLAGS) \ + $(GDU_CFLAGS) \ $(NULL) CORE_LIBADD = \ @@ -28,8 +29,7 @@ CORE_LIBADD = \ $(GTHREAD2_LIBS) \ $(GTK3_LIBS) \ $(INTLLIBS) \ - $(top_builddir)/src/gdu/libgdu.la \ - $(top_builddir)/src/gdu-gtk/libgdu-gtk.la \ + $(GDU_LIBS) \ $(NULL) libexec_PROGRAMS = gdu-format-tool diff --git a/src/nautilus-extension/Makefile.am b/src/nautilus-extension/Makefile.am index c5a9875..2c66cec 100644 --- a/src/nautilus-extension/Makefile.am +++ b/src/nautilus-extension/Makefile.am @@ -19,6 +19,7 @@ CORE_CFLAGS = \ $(GIO_UNIX2_CFLAGS) \ $(GTHREAD2_CFLAGS) \ $(GTK2_CFLAGS) \ + $(GDU_CFLAGS) \ $(NULL) CORE_LIBADD = \ @@ -29,8 +30,7 @@ CORE_LIBADD = \ $(GTHREAD2_LIBS) \ $(GTK2_LIBS) \ $(INTLLIBS) \ - $(top_builddir)/src/gdu/libgdu.la \ - $(top_builddir)/src/gdu-gtk/libgdu-gtk.la \ + $(GDU_LIBS) \ $(NULL) diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am index 912da87..ca50998 100644 --- a/src/palimpsest/Makefile.am +++ b/src/palimpsest/Makefile.am @@ -34,6 +34,7 @@ palimpsest_CFLAGS = \ $(GTK3_CFLAGS) \ $(UNIQUE_CFLAGS) \ $(X11_CFLAGS) \ + $(GDU_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) @@ -50,8 +51,7 @@ palimpsest_LDADD = \ $(UNIQUE_LIBS) \ $(X11_LIBS) \ $(INTLLIBS) \ - $(top_builddir)/src/gdu/libgdu.la \ - $(top_builddir)/src/gdu-gtk/libgdu-gtk.la + $(GDU_LIBS) clean-local : rm -f *~ -- 1.7.8.5