1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
|
From b18ee6b0ee74e10056460b7107e7dd8f2d39dd8e Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Thu, 12 Apr 2012 02:56:40 -0400
Subject: [PATCH] Split palimpsest and nautilus plugin out
---
Makefile.am | 2 +-
configure.ac | 53 +---------------------------------------
data/Makefile.am | 6 ----
data/icons/16x16/Makefile.am | 1 -
data/icons/22x22/Makefile.am | 1 -
data/icons/24x24/Makefile.am | 1 -
data/icons/256x256/Makefile.am | 1 -
data/icons/32x32/Makefile.am | 1 -
data/icons/48x48/Makefile.am | 1 -
src/Makefile.am | 6 +----
10 files changed, 3 insertions(+), 70 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4fd5718..7b5b3ae 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 doc po
EXTRA_DIST = \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index 77a16ab..c785122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,6 @@ GIO2_REQUIRED=2.22
DBUS_GLIB_REQUIRED=0.74
GNOME_KEYRING_REQUIRED=2.22
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
@@ -147,25 +146,12 @@ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
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])
# *************
-# Remote Access
-# *************
-have_remote_access=no
-AC_ARG_ENABLE(remote_access, AS_HELP_STRING([--disable-remote-access], [disable access to remote udisks daemons]))
-if test "x$enable_remote_access" != "xno"; then
- AC_DEFINE(HAVE_REMOTE_ACCESS, 1, [Defined if remote access is enabled])
- have_remote_access=yes
-fi
-AM_CONDITIONAL(HAVE_REMOTE_ACCESS, [test "$have_remote_access" = "yes"])
-
-# *************
# GNOME Keyring
# *************
@@ -185,48 +171,17 @@ AC_SUBST(GNOME_KEYRING_LIBS)
AC_SUBST(GNOME_KEYRING_CFLAGS)
AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
-# *************
-# Documentation
-# *************
-
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
- AC_MSG_ERROR(Could not find scrollkeeper-config, please install the scrollkeeper package)
-fi
-
# ********************
# Internationalization
# ********************
IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
-GETTEXT_PACKAGE=gnome-disk-utility
+GETTEXT_PACKAGE=libgdu
AC_SUBST([GETTEXT_PACKAGE])
AM_GLIB_GNU_GETTEXT
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
-# ******************
-# Nautilus extension
-# ******************
-
-have_nautilus=no
-AC_ARG_ENABLE(nautilus, AS_HELP_STRING([--disable-nautilus], [disable nautilus extension]))
-
-if test "x$enable_nautilus" != "xno"; then
- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED,
- [AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available])
- have_nautilus=yes], have_nautilus=no)
- if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then
- AC_MSG_ERROR([nautilus support requested but libraries not found])
- fi
-fi
-
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
-AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"])
-
# *************************************
# *************************************
@@ -242,10 +197,7 @@ 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
data/Makefile
data/gdu-notification-daemon.desktop.in.in
@@ -257,7 +209,6 @@ data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/icons/256x256/Makefile
data/icons/scalable/Makefile
-help/Makefile
doc/Makefile
doc/version.xml
])
@@ -283,8 +234,6 @@ echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
Building api docs: ${enable_gtk_doc}
- Nautilus extension: ${have_nautilus}
GNOME Keyring support: ${have_gnome_keyring}
- Remote Access: ${have_remote_access}
"
diff --git a/data/Makefile.am b/data/Makefile.am
index 785368d..631be17 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,10 +2,6 @@ NULL =
SUBDIRS = icons
-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)
@@ -18,12 +14,10 @@ gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in
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 \
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index f62ef2d..324b5be 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -2,7 +2,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/16x16/apps
icon_DATA = \
- palimpsest.png \
gdu-eject.png \
gdu-detach.png \
gdu-mount.png \
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index c0b4c4d..b56491d 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -2,7 +2,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/22x22/apps
icon_DATA = \
- palimpsest.png \
gdu-eject.png \
gdu-detach.png \
gdu-mount.png \
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 4dc6898..d465ffe 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -5,7 +5,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/24x24/apps
icon_DATA = \
- palimpsest.png \
$(NULL)
EXTRA_DIST = \
diff --git a/data/icons/256x256/Makefile.am b/data/icons/256x256/Makefile.am
index dc7e73a..14c8dea 100644
--- a/data/icons/256x256/Makefile.am
+++ b/data/icons/256x256/Makefile.am
@@ -2,7 +2,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/256x256/apps
icon_DATA = \
- palimpsest.png \
$(NULL)
EXTRA_DIST = \
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 9a2bc76..ad18728 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -2,7 +2,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/32x32/apps
icon_DATA = \
- palimpsest.png \
$(NULL)
EXTRA_DIST = \
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 349b8ce..c3164be 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -2,7 +2,6 @@ NULL =
icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = \
- palimpsest.png \
gdu-eject.png \
gdu-detach.png \
gdu-mount.png \
diff --git a/src/Makefile.am b/src/Makefile.am
index bab902f..19667a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = gdu gdu-gtk palimpsest notification format-tool
-
-if ENABLE_NAUTILUS
-SUBDIRS += nautilus-extension
-endif
+SUBDIRS = gdu gdu-gtk notification
clean-local :
rm -f *~
--
1.7.8.5
|
GitWeb