2007-11-28 13:39:07 +01:00
|
|
|
include $(top_srcdir)/Makefile.decl
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
NULL =
|
|
|
|
|
|
2008-01-07 14:42:08 +01:00
|
|
|
SUBDIRS=
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
if OS_UNIX
|
2008-12-29 18:53:47 +01:00
|
|
|
SUBDIRS += libasyncns xdgmime
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
2008-03-13 18:10:04 +01:00
|
|
|
if MS_LIB_AVAILABLE
|
|
|
|
|
noinst_DATA = gio-2.0.lib
|
|
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
|
|
|
|
|
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
|
|
|
|
|
endif
|
|
|
|
|
endif
|
2008-03-13 18:10:04 +01:00
|
|
|
|
|
|
|
|
install-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(install_ms_lib_cmd)
|
|
|
|
|
|
2008-03-13 18:10:04 +01:00
|
|
|
uninstall-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(uninstall_ms_lib_cmd)
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2007-11-28 13:39:07 +01:00
|
|
|
gio.def: gio.symbols
|
2010-06-16 04:01:02 +02:00
|
|
|
$(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \
|
2007-12-14 15:28:35 +01:00
|
|
|
mv gio.def.tmp gio.def
|
2007-11-28 13:39:07 +01:00
|
|
|
|
|
|
|
|
if OS_LINUX
|
|
|
|
|
if HAVE_GNUC_VISIBILITY
|
2010-07-08 01:53:22 +02:00
|
|
|
TESTS = abicheck.sh
|
2007-11-28 13:39:07 +01:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2010-01-12 21:28:23 +01:00
|
|
|
if HAVE_THREADS
|
|
|
|
|
THREAD_FLAGS=-DG_THREADS_MANDATORY
|
|
|
|
|
endif
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-DG_LOG_DOMAIN=\"GLib-GIO\" \
|
2010-08-06 19:09:26 +02:00
|
|
|
$(gmodule_INCLUDES) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(GLIB_DEBUG_FLAGS) \
|
2010-01-12 21:28:23 +01:00
|
|
|
$(THREAD_FLAGS) \
|
2007-11-26 17:13:05 +01:00
|
|
|
-DG_DISABLE_DEPRECATED \
|
2007-12-14 11:35:24 +01:00
|
|
|
-DGIO_COMPILATION \
|
2007-11-27 13:39:14 +01:00
|
|
|
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
lib_LTLIBRARIES = libgio-2.0.la
|
|
|
|
|
|
|
|
|
|
marshal_sources = \
|
2007-11-28 13:39:07 +01:00
|
|
|
gio-marshal.h \
|
|
|
|
|
gio-marshal.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
if CROSS_COMPILING
|
|
|
|
|
glib_genmarshal=$(GLIB_GENMARSHAL)
|
|
|
|
|
else
|
|
|
|
|
glib_genmarshal=../gobject/glib-genmarshal
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
gio-marshal.h: gio-marshal.list
|
2010-06-16 04:01:02 +02:00
|
|
|
$(AM_V_GEN) $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \
|
2007-12-14 15:28:35 +01:00
|
|
|
mv $@.tmp $@
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
gio-marshal.c: gio-marshal.h gio-marshal.list
|
2010-06-16 04:01:02 +02:00
|
|
|
$(AM_V_GEN) (echo "#include \"gio-marshal.h\""; \
|
2008-01-07 14:56:10 +01:00
|
|
|
$(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \
|
2007-12-14 15:28:35 +01:00
|
|
|
mv $@.tmp $@
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus_headers = \
|
|
|
|
|
gdbusauthobserver.h \
|
|
|
|
|
gcredentials.h \
|
|
|
|
|
gdbusutils.h \
|
|
|
|
|
gdbuserror.h \
|
|
|
|
|
gdbusaddress.h \
|
|
|
|
|
gdbusconnection.h \
|
|
|
|
|
gdbusmessage.h \
|
|
|
|
|
gdbusnameowning.h \
|
|
|
|
|
gdbusnamewatching.h \
|
|
|
|
|
gdbusproxy.h \
|
|
|
|
|
gdbusintrospection.h \
|
|
|
|
|
gdbusmethodinvocation.h \
|
|
|
|
|
gdbusserver.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
gdbus_sources = \
|
|
|
|
|
gdbusutils.h gdbusutils.c \
|
|
|
|
|
gdbusaddress.h gdbusaddress.c \
|
|
|
|
|
gdbusauthobserver.h gdbusauthobserver.c \
|
|
|
|
|
gdbusauth.h gdbusauth.c \
|
|
|
|
|
gdbusauthmechanism.h gdbusauthmechanism.c \
|
|
|
|
|
gdbusauthmechanismanon.h gdbusauthmechanismanon.c \
|
|
|
|
|
gdbusauthmechanismexternal.h gdbusauthmechanismexternal.c \
|
|
|
|
|
gdbusauthmechanismsha1.h gdbusauthmechanismsha1.c \
|
|
|
|
|
gdbuserror.h gdbuserror.c \
|
|
|
|
|
gdbusconnection.h gdbusconnection.c \
|
|
|
|
|
gdbusmessage.h gdbusmessage.c \
|
|
|
|
|
gdbusnameowning.h gdbusnameowning.c \
|
|
|
|
|
gdbusnamewatching.h gdbusnamewatching.c \
|
|
|
|
|
gdbusproxy.h gdbusproxy.c \
|
|
|
|
|
gdbusprivate.h gdbusprivate.c \
|
|
|
|
|
gdbusintrospection.h gdbusintrospection.c \
|
|
|
|
|
gdbusmethodinvocation.h gdbusmethodinvocation.c \
|
|
|
|
|
gdbusserver.h gdbusserver.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-04-17 05:17:01 +02:00
|
|
|
settings_headers = \
|
|
|
|
|
gsettingsbackend.h \
|
|
|
|
|
gsettings.h
|
|
|
|
|
|
2010-04-15 20:59:41 +02:00
|
|
|
settings_sources = \
|
2010-04-17 05:17:01 +02:00
|
|
|
gvdb/gvdb-format.h \
|
|
|
|
|
gvdb/gvdb-reader.h \
|
|
|
|
|
gvdb/gvdb-reader.c \
|
2010-04-16 18:02:44 +02:00
|
|
|
gdelayedsettingsbackend.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gdelayedsettingsbackend.c \
|
2010-04-17 05:57:26 +02:00
|
|
|
gkeyfilesettingsbackend.c \
|
2010-04-17 07:02:57 +02:00
|
|
|
gmemorysettingsbackend.h \
|
|
|
|
|
gmemorysettingsbackend.c \
|
2010-04-16 00:22:14 +02:00
|
|
|
gnullsettingsbackend.h \
|
|
|
|
|
gnullsettingsbackend.c \
|
2010-04-17 05:17:01 +02:00
|
|
|
gsettingsbackendinternal.h \
|
2010-04-16 04:30:11 +02:00
|
|
|
gsettingsbackend.c \
|
|
|
|
|
gsettingsschema.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gsettingsschema.c \
|
|
|
|
|
gsettings-mapping.h \
|
|
|
|
|
gsettings-mapping.c \
|
|
|
|
|
gsettings.c
|
2010-04-15 20:59:41 +02:00
|
|
|
|
2010-08-12 17:10:23 +02:00
|
|
|
if OS_WIN32
|
|
|
|
|
settings_sources += \
|
|
|
|
|
gregistrysettingsbackend.h \
|
|
|
|
|
gregistrysettingsbackend.c
|
|
|
|
|
endif
|
|
|
|
|
|
2010-08-18 06:30:44 +02:00
|
|
|
application_headers = \
|
|
|
|
|
gactiongroup.h \
|
2010-08-18 08:15:09 +02:00
|
|
|
gsimpleactiongroup.h \
|
2010-08-18 07:45:15 +02:00
|
|
|
gaction.h \
|
2010-08-30 18:58:49 +02:00
|
|
|
gsimpleaction.h \
|
2010-08-18 06:30:44 +02:00
|
|
|
gapplication.h
|
|
|
|
|
|
|
|
|
|
application_sources = \
|
|
|
|
|
gactiongroup.c \
|
2010-08-18 08:15:09 +02:00
|
|
|
gsimpleactiongroup.c \
|
2010-08-18 07:45:15 +02:00
|
|
|
gaction.c \
|
2010-08-30 18:58:49 +02:00
|
|
|
gsimpleaction.c \
|
2010-08-18 06:30:44 +02:00
|
|
|
gapplication.c
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
local_sources = \
|
|
|
|
|
glocaldirectorymonitor.c \
|
|
|
|
|
glocaldirectorymonitor.h \
|
|
|
|
|
glocalfile.c \
|
|
|
|
|
glocalfile.h \
|
|
|
|
|
glocalfileenumerator.c \
|
|
|
|
|
glocalfileenumerator.h \
|
|
|
|
|
glocalfileinfo.c \
|
|
|
|
|
glocalfileinfo.h \
|
|
|
|
|
glocalfileinputstream.c \
|
|
|
|
|
glocalfileinputstream.h \
|
|
|
|
|
glocalfilemonitor.c \
|
|
|
|
|
glocalfilemonitor.h \
|
|
|
|
|
glocalfileoutputstream.c \
|
|
|
|
|
glocalfileoutputstream.h \
|
2009-05-13 13:03:47 +02:00
|
|
|
glocalfileiostream.c \
|
|
|
|
|
glocalfileiostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
glocalvfs.c \
|
|
|
|
|
glocalvfs.h \
|
2010-05-25 22:02:42 +02:00
|
|
|
gsocks4proxy.c \
|
|
|
|
|
gsocks4proxy.h \
|
|
|
|
|
gsocks4aproxy.c \
|
|
|
|
|
gsocks4aproxy.h \
|
2010-04-29 21:22:55 +02:00
|
|
|
gsocks5proxy.c \
|
|
|
|
|
gsocks5proxy.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
platform_libadd =
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps =
|
2007-11-26 17:13:05 +01:00
|
|
|
appinfo_sources =
|
|
|
|
|
|
|
|
|
|
if HAVE_INOTIFY
|
|
|
|
|
SUBDIRS += inotify
|
|
|
|
|
platform_libadd += inotify/libinotify.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += inotify/libinotify.la
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2008-03-14 09:58:24 +01:00
|
|
|
if HAVE_FEN
|
|
|
|
|
AM_CPPFLAGS += -DHAVE_FEN
|
|
|
|
|
SUBDIRS += fen
|
|
|
|
|
platform_libadd += fen/libfen.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += fen/libfen.la
|
2008-03-14 09:58:24 +01:00
|
|
|
endif
|
|
|
|
|
|
2008-03-12 20:09:11 +01:00
|
|
|
if OS_WIN32
|
|
|
|
|
SUBDIRS += win32
|
|
|
|
|
platform_libadd += win32/libgiowin32.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += win32/libgiowin32.la
|
2008-03-12 20:09:11 +01:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
SUBDIRS += .
|
|
|
|
|
|
|
|
|
|
if HAVE_FAM
|
|
|
|
|
SUBDIRS += fam
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if OS_UNIX
|
2010-05-09 18:41:02 +02:00
|
|
|
appinfo_sources += gdesktopappinfo.c
|
2008-12-29 18:53:47 +01:00
|
|
|
platform_libadd += libasyncns/libasyncns.la xdgmime/libxdgmime.la
|
|
|
|
|
platform_deps += libasyncns/libasyncns.la xdgmime/libxdgmime.la
|
2007-11-26 17:13:05 +01:00
|
|
|
unix_sources = \
|
2010-05-09 18:41:02 +02:00
|
|
|
gfiledescriptorbased.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gunixconnection.c \
|
2010-05-09 18:41:02 +02:00
|
|
|
gunixcredentialsmessage.c \
|
2009-11-12 04:40:28 +01:00
|
|
|
gunixfdlist.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
gunixfdmessage.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gunixmount.c \
|
|
|
|
|
gunixmount.h \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixmounts.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gunixresolver.c \
|
|
|
|
|
gunixresolver.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
gunixsocketaddress.c \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixvolume.c \
|
|
|
|
|
gunixvolume.h \
|
|
|
|
|
gunixvolumemonitor.c \
|
|
|
|
|
gunixvolumemonitor.h \
|
|
|
|
|
gunixinputstream.c \
|
|
|
|
|
gunixoutputstream.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
giounixincludedir=$(includedir)/gio-unix-2.0/gio
|
|
|
|
|
giounixinclude_HEADERS = \
|
2007-12-10 19:51:21 +01:00
|
|
|
gdesktopappinfo.h \
|
2010-02-07 14:51:01 +01:00
|
|
|
gfiledescriptorbased.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gunixconnection.h \
|
2010-05-09 18:41:02 +02:00
|
|
|
gunixcredentialsmessage.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gunixmounts.h \
|
2009-11-12 04:40:28 +01:00
|
|
|
gunixfdlist.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gunixfdmessage.h \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixinputstream.h \
|
|
|
|
|
gunixoutputstream.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
gunixsocketaddress.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
endif
|
|
|
|
|
|
2010-06-22 11:13:21 +02:00
|
|
|
win32_actual_sources = \
|
2008-06-17 23:40:04 +02:00
|
|
|
gwin32mount.c \
|
|
|
|
|
gwin32mount.h \
|
2008-12-29 18:53:47 +01:00
|
|
|
gwin32resolver.c \
|
|
|
|
|
gwin32resolver.h \
|
2008-06-17 23:40:04 +02:00
|
|
|
gwin32volumemonitor.c \
|
|
|
|
|
gwin32volumemonitor.h \
|
2010-04-19 10:32:05 +02:00
|
|
|
gwin32inputstream.c \
|
|
|
|
|
gwin32outputstream.c \
|
|
|
|
|
gwin32outputstream.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-05-03 18:56:46 +02:00
|
|
|
win32_more_sources_for_vcproj = \
|
|
|
|
|
gwin32appinfo.c \
|
|
|
|
|
win32/gwin32directorymonitor.c \
|
|
|
|
|
win32/gwinhttpfile.c \
|
|
|
|
|
win32/gwinhttpfileinputstream.c \
|
|
|
|
|
win32/gwinhttpfileoutputstream.c \
|
|
|
|
|
win32/gwinhttpvfs.c
|
|
|
|
|
|
2010-06-22 11:13:21 +02:00
|
|
|
if OS_WIN32
|
|
|
|
|
appinfo_sources += gwin32appinfo.c gwin32appinfo.h
|
|
|
|
|
platform_libadd += -lshlwapi -lws2_32 -ldnsapi
|
|
|
|
|
win32_sources = $(win32_actual_sources)
|
|
|
|
|
|
2010-04-19 10:32:05 +02:00
|
|
|
giowin32includedir=$(includedir)/gio-win32-2.0/gio
|
|
|
|
|
giowin32include_HEADERS = \
|
|
|
|
|
gwin32inputstream.h \
|
|
|
|
|
gwin32outputstream.h \
|
2008-06-17 23:40:04 +02:00
|
|
|
$(NULL)
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2009-07-06 04:49:24 +02:00
|
|
|
SUBDIRS += tests
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
libgio_2_0_la_SOURCES = \
|
|
|
|
|
gappinfo.c \
|
|
|
|
|
gasynchelper.c \
|
|
|
|
|
gasynchelper.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gasyncinitable.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gasyncresult.c \
|
|
|
|
|
gbufferedinputstream.c \
|
|
|
|
|
gbufferedoutputstream.c \
|
|
|
|
|
gcancellable.c \
|
|
|
|
|
gcontenttype.c \
|
|
|
|
|
gcontenttypeprivate.h \
|
2009-10-21 21:25:36 +02:00
|
|
|
gcharsetconverter.c \
|
2009-11-18 13:14:13 +01:00
|
|
|
gconverter.c \
|
2009-10-22 22:50:52 +02:00
|
|
|
gconverterinputstream.c \
|
2009-11-23 15:03:57 +01:00
|
|
|
gconverteroutputstream.c \
|
2010-05-09 18:41:02 +02:00
|
|
|
gcredentials.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdatainputstream.c \
|
|
|
|
|
gdataoutputstream.c \
|
|
|
|
|
gdrive.c \
|
2007-11-27 11:46:45 +01:00
|
|
|
gdummyfile.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdummyfile.c \
|
2010-05-07 21:55:54 +02:00
|
|
|
gdummyproxyresolver.c \
|
|
|
|
|
gdummyproxyresolver.h \
|
2008-08-04 19:19:30 +02:00
|
|
|
gemblem.h \
|
|
|
|
|
gemblem.c \
|
2008-07-28 17:35:07 +02:00
|
|
|
gemblemedicon.h \
|
|
|
|
|
gemblemedicon.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfile.c \
|
|
|
|
|
gfileattribute.c \
|
2007-12-14 16:56:56 +01:00
|
|
|
gfileattribute-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfileenumerator.c \
|
|
|
|
|
gfileicon.c \
|
|
|
|
|
gfileinfo.c \
|
2009-06-29 13:55:22 +02:00
|
|
|
gfileinfo-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfileinputstream.c \
|
|
|
|
|
gfilemonitor.c \
|
|
|
|
|
gfilenamecompleter.c \
|
|
|
|
|
gfileoutputstream.c \
|
2009-05-12 16:59:36 +02:00
|
|
|
gfileiostream.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfilterinputstream.c \
|
|
|
|
|
gfilteroutputstream.c \
|
|
|
|
|
gicon.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetaddress.c \
|
|
|
|
|
ginetsocketaddress.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
ginitable.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
ginputstream.c \
|
2008-07-01 08:32:35 +02:00
|
|
|
gioenums.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioerror.c \
|
|
|
|
|
giomodule.c \
|
2007-12-05 12:10:21 +01:00
|
|
|
giomodule-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioscheduler.c \
|
2009-05-12 16:30:15 +02:00
|
|
|
giostream.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gloadableicon.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmount.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gmemoryinputstream.c \
|
|
|
|
|
gmemoryoutputstream.c \
|
|
|
|
|
gmountoperation.c \
|
|
|
|
|
gnativevolumemonitor.c \
|
|
|
|
|
gnativevolumemonitor.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkaddress.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
gnetworkingprivate.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkservice.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
goutputstream.c \
|
2010-06-03 22:58:52 +02:00
|
|
|
gpermission.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gpollfilemonitor.c \
|
|
|
|
|
gpollfilemonitor.h \
|
2010-05-07 21:55:54 +02:00
|
|
|
gproxyresolver.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gresolver.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gseekable.c \
|
|
|
|
|
gsimpleasyncresult.c \
|
2010-06-04 22:32:01 +02:00
|
|
|
gsimplepermission.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
gsocket.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
gsocketaddress.c \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketaddressenumerator.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketclient.c \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketconnectable.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketconnection.c \
|
|
|
|
|
gsocketcontrolmessage.c \
|
|
|
|
|
gsocketinputstream.c \
|
|
|
|
|
gsocketinputstream.h \
|
|
|
|
|
gsocketlistener.c \
|
|
|
|
|
gsocketoutputstream.c \
|
|
|
|
|
gsocketoutputstream.h \
|
2010-08-10 21:24:37 +02:00
|
|
|
gproxy.c \
|
2010-04-26 23:27:33 +02:00
|
|
|
gproxyaddress.c \
|
2010-08-10 21:25:11 +02:00
|
|
|
gproxyaddressenumerator.c \
|
2010-07-23 02:51:23 +02:00
|
|
|
gproxyconnection.c \
|
|
|
|
|
gproxyconnection.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketservice.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gsrvtarget.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gtcpconnection.c \
|
|
|
|
|
gthreadedsocketservice.c\
|
2007-11-26 17:13:05 +01:00
|
|
|
gthemedicon.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gthreadedresolver.c \
|
|
|
|
|
gthreadedresolver.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gunionvolumemonitor.c \
|
|
|
|
|
gunionvolumemonitor.h \
|
|
|
|
|
gvfs.c \
|
|
|
|
|
gvolume.c \
|
|
|
|
|
gvolumemonitor.c \
|
2009-11-20 12:04:31 +01:00
|
|
|
gzlibcompressor.c \
|
2009-11-19 17:20:20 +01:00
|
|
|
gzlibdecompressor.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmountprivate.h \
|
2007-12-01 02:53:00 +01:00
|
|
|
gioenumtypes.h \
|
|
|
|
|
gioenumtypes.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(appinfo_sources) \
|
|
|
|
|
$(unix_sources) \
|
2008-06-17 23:40:04 +02:00
|
|
|
$(win32_sources) \
|
2010-08-18 06:30:44 +02:00
|
|
|
$(application_sources) \
|
2010-04-15 20:59:41 +02:00
|
|
|
$(settings_sources) \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(gdbus_sources) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(local_sources) \
|
|
|
|
|
$(marshal_sources) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-06-14 23:29:41 +02:00
|
|
|
EXTRA_DIST += gnullapplication.c gdbusapplication.c strinfo.c
|
2010-06-07 19:25:39 +02:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
$(libgio_2_0_la_OBJECTS): $(marshal_sources)
|
|
|
|
|
|
|
|
|
|
libgio_2_0_la_LIBADD = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
|
|
|
|
$(platform_libadd) \
|
2009-11-19 17:16:29 +01:00
|
|
|
$(ZLIB_LIBS) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(SELINUX_LIBS) \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(XATTR_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2008-03-13 18:10:04 +01:00
|
|
|
if PLATFORM_WIN32
|
2007-11-26 17:13:05 +01:00
|
|
|
no_undefined = -no-undefined
|
|
|
|
|
endif
|
|
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
2008-03-13 18:10:04 +01:00
|
|
|
export_symbols = -export-symbols gio.def
|
2008-03-16 10:30:21 +01:00
|
|
|
gio_def = gio.def
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2010-02-03 23:37:13 +01:00
|
|
|
gio_win32_res = gio-win32-res.o
|
|
|
|
|
gio_win32_res_ldflag = -Wl,$(gio_win32_res)
|
|
|
|
|
|
2008-03-13 18:10:04 +01:00
|
|
|
install-def-file:
|
|
|
|
|
$(INSTALL) gio.def $(DESTDIR)$(libdir)/gio-2.0.def
|
|
|
|
|
|
|
|
|
|
uninstall-def-file:
|
|
|
|
|
-rm $(DESTDIR)$(libdir)/gio-2.0.def
|
|
|
|
|
else
|
|
|
|
|
install-def-file:
|
|
|
|
|
uninstall-def-file:
|
|
|
|
|
|
|
|
|
|
export_symbols = -export-symbols-regex '^g_.*'
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
install-data-local: install-ms-lib install-def-file
|
2008-10-10 07:00:17 +02:00
|
|
|
$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
|
2008-03-13 18:10:04 +01:00
|
|
|
|
|
|
|
|
uninstall-local: uninstall-ms-lib uninstall-def-file
|
|
|
|
|
|
2010-06-21 19:55:28 +02:00
|
|
|
libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
|
2010-02-03 23:37:13 +01:00
|
|
|
$(gio_win32_res_ldflag) \
|
2008-04-22 15:51:37 +02:00
|
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
|
|
|
|
-export-dynamic $(no_undefined) $(export_symbols)
|
|
|
|
|
|
2010-02-03 23:37:13 +01:00
|
|
|
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
|
|
|
|
|
|
|
|
|
|
gio-win32-res.o: gio.rc
|
|
|
|
|
$(WINDRES) gio.rc $@
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-12-01 02:53:00 +01:00
|
|
|
gio_headers = \
|
2007-11-26 17:13:05 +01:00
|
|
|
gappinfo.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gasyncinitable.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gasyncresult.h \
|
|
|
|
|
gbufferedinputstream.h \
|
|
|
|
|
gbufferedoutputstream.h \
|
|
|
|
|
gcancellable.h \
|
|
|
|
|
gcontenttype.h \
|
2009-10-21 21:25:36 +02:00
|
|
|
gcharsetconverter.h \
|
2009-11-18 13:14:13 +01:00
|
|
|
gconverter.h \
|
2009-10-22 22:50:52 +02:00
|
|
|
gconverterinputstream.h \
|
2009-11-23 15:03:57 +01:00
|
|
|
gconverteroutputstream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdatainputstream.h \
|
|
|
|
|
gdataoutputstream.h \
|
|
|
|
|
gdrive.h \
|
2008-08-04 19:19:30 +02:00
|
|
|
gemblem.h \
|
2008-07-28 20:25:49 +02:00
|
|
|
gemblemedicon.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfile.h \
|
|
|
|
|
gfileattribute.h \
|
|
|
|
|
gfileenumerator.h \
|
|
|
|
|
gfileicon.h \
|
|
|
|
|
gfileinfo.h \
|
|
|
|
|
gfileinputstream.h \
|
|
|
|
|
gfilemonitor.h \
|
|
|
|
|
gfilenamecompleter.h \
|
|
|
|
|
gfileoutputstream.h \
|
2009-05-12 16:59:36 +02:00
|
|
|
gfileiostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfilterinputstream.h \
|
|
|
|
|
gfilteroutputstream.h \
|
|
|
|
|
gicon.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetaddress.h \
|
|
|
|
|
ginetsocketaddress.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
ginputstream.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
ginitable.h \
|
2007-11-27 11:46:45 +01:00
|
|
|
gio.h \
|
2008-07-01 08:32:35 +02:00
|
|
|
giotypes.h \
|
|
|
|
|
gioenums.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioerror.h \
|
|
|
|
|
giomodule.h \
|
|
|
|
|
gioscheduler.h \
|
2009-05-12 16:30:15 +02:00
|
|
|
giostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gloadableicon.h \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmount.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gmemoryinputstream.h \
|
|
|
|
|
gmemoryoutputstream.h \
|
|
|
|
|
gmountoperation.h \
|
Provide eject() on both GMount and GVolume and utility functions to guess
2007-12-14 David Zeuthen <davidz@redhat.com>
* Makefile.am:
* gio.symbols:
* gmount.c: (g_mount_get_uuid), (g_mount_can_eject),
(g_mount_eject), (g_mount_eject_finish):
* gmount.h:
* gunionvolumemonitor.c: (g_union_volume_monitor_finalize),
(get_volume_for_uuid), (get_mount_for_uuid),
(g_union_volume_monitor_class_init),
(get_default_native_type_with_exclude), (get_default_native_type),
(get_native_type), (update_native_type),
(g_union_volume_monitor_init), (_g_mount_get_for_mount_path):
* gunixmount.c: (_g_unix_mount_new), (g_unix_mount_get_uuid),
(g_unix_mount_can_eject), (eject_unmount_cb),
(eject_unmount_read_error), (eject_unmount_do),
(g_unix_mount_unmount), (g_unix_mount_eject),
(g_unix_mount_eject_finish), (g_unix_mount_mount_iface_init):
* gunixmounts.c: (g_unix_mount_guess_can_eject),
(g_unix_mount_point_guess_can_eject):
* gunixmounts.h:
* gunixvolume.c: (_g_unix_volume_new), (g_unix_volume_get_uuid),
(g_unix_volume_can_eject), (g_unix_volume_get_drive),
(eject_mount_cb), (eject_mount_read_error), (eject_mount_do),
(g_unix_volume_mount), (g_unix_volume_eject),
(g_unix_volume_eject_finish), (g_unix_volume_volume_iface_init):
* gunixvolumemonitor.c: (get_volume_for_uuid),
(get_mount_for_uuid), (g_unix_volume_monitor_class_init),
(update_mounts):
* gvolume.c: (g_volume_get_uuid), (g_volume_can_eject),
(g_volume_eject), (g_volume_eject_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_get_volume_for_uuid),
(g_volume_monitor_get_mount_for_uuid):
* gvolumemonitor.h:
Provide eject() on both GMount and GVolume and utility functions
to guess whether a GUnixMountPoint or GUnixMountEntry should be
ejected. Introduce the concept of UUID's and wire it into GVolume
and GMount and provide API on GVolumeMonitor to find such
instances. Also handle the case where an external
GNativeVolumeMonitor fails to initialize. Lock around the
_g_get_mount_for_mount_path() function such that volume monitor
implementations won't have to do locking themselves.
svn path=/trunk/; revision=6140
2007-12-17 10:31:08 +01:00
|
|
|
gnativevolumemonitor.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkaddress.h \
|
|
|
|
|
gnetworkservice.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
goutputstream.h \
|
2010-06-03 22:58:52 +02:00
|
|
|
gpermission.h \
|
2010-04-26 23:27:33 +02:00
|
|
|
gproxyaddress.h \
|
2010-08-10 21:24:37 +02:00
|
|
|
gproxy.h \
|
2010-08-10 21:25:11 +02:00
|
|
|
gproxyaddressenumerator.h \
|
2010-05-07 21:55:54 +02:00
|
|
|
gproxyresolver.h \
|
2008-12-29 18:53:47 +01:00
|
|
|
gresolver.h \
|
2007-11-26 17:36:52 +01:00
|
|
|
gseekable.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gsimpleasyncresult.h \
|
2010-06-04 22:32:01 +02:00
|
|
|
gsimplepermission.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gsocket.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
gsocketaddress.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketaddressenumerator.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketclient.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketconnectable.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketconnection.h \
|
|
|
|
|
gsocketcontrolmessage.h \
|
|
|
|
|
gsocketlistener.h \
|
|
|
|
|
gsocketservice.h \
|
2008-12-29 18:53:47 +01:00
|
|
|
gsrvtarget.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gtcpconnection.h \
|
|
|
|
|
gthreadedsocketservice.h\
|
2007-11-26 17:13:05 +01:00
|
|
|
gthemedicon.h \
|
|
|
|
|
gvfs.h \
|
|
|
|
|
gvolume.h \
|
|
|
|
|
gvolumemonitor.h \
|
2009-11-20 12:04:31 +01:00
|
|
|
gzlibcompressor.h \
|
2009-11-19 17:20:20 +01:00
|
|
|
gzlibdecompressor.h \
|
2010-08-18 06:30:44 +02:00
|
|
|
$(application_headers) \
|
2010-04-17 05:17:01 +02:00
|
|
|
$(settings_headers) \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(gdbus_headers) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
2007-12-01 02:53:00 +01:00
|
|
|
gioincludedir=$(includedir)/glib-2.0/gio/
|
|
|
|
|
gioinclude_HEADERS = \
|
|
|
|
|
$(gio_headers) \
|
|
|
|
|
gioenumtypes.h
|
2007-11-28 13:39:07 +01:00
|
|
|
|
|
|
|
|
# these sources (also mentioned above) are generated.
|
2007-12-01 02:53:00 +01:00
|
|
|
BUILT_SOURCES = \
|
|
|
|
|
gio-marshal.h \
|
|
|
|
|
gio-marshal.c \
|
|
|
|
|
gioenumtypes.h \
|
|
|
|
|
gioenumtypes.c \
|
|
|
|
|
$(NULL)
|
2007-11-28 13:39:07 +01:00
|
|
|
|
2007-12-04 01:35:42 +01:00
|
|
|
EXTRA_DIST += \
|
2007-11-26 17:13:05 +01:00
|
|
|
gio-marshal.list \
|
2007-11-28 13:39:07 +01:00
|
|
|
gio.symbols \
|
2007-12-01 02:53:00 +01:00
|
|
|
gioenumtypes.h.template \
|
|
|
|
|
gioenumtypes.c.template \
|
2008-05-19 07:18:10 +02:00
|
|
|
makefile.msc \
|
2007-12-21 01:37:41 +01:00
|
|
|
abicheck.sh \
|
2010-02-03 23:37:13 +01:00
|
|
|
gio.rc.in \
|
2010-04-19 20:04:42 +02:00
|
|
|
gschema.dtd \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
2010-02-03 23:37:13 +01:00
|
|
|
BUILT_EXTRA_DIST = \
|
|
|
|
|
gio.rc
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
CLEANFILES = \
|
|
|
|
|
$(marshal_sources) \
|
|
|
|
|
$(NULL)
|
2007-12-01 02:53:00 +01:00
|
|
|
|
2007-12-01 18:40:19 +01:00
|
|
|
gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
|
2010-06-16 04:01:02 +02:00
|
|
|
$(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
|
2007-12-14 15:28:35 +01:00
|
|
|
cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
|
|
|
|
|
gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
|
|
|
|
|
|
2007-12-01 18:40:19 +01:00
|
|
|
gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
|
2010-06-16 04:01:02 +02:00
|
|
|
$(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
|
2007-12-14 15:28:35 +01:00
|
|
|
cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
|
|
|
|
|
gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
|
2008-03-13 18:10:04 +01:00
|
|
|
|
|
|
|
|
gio-2.0.lib: libgio-2.0.la gio.def
|
2008-07-27 17:54:15 +02:00
|
|
|
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@
|
2009-06-22 21:33:41 +02:00
|
|
|
|
2010-04-23 23:27:26 +02:00
|
|
|
bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
|
2010-04-19 11:25:22 +02:00
|
|
|
|
2010-01-12 13:11:22 +01:00
|
|
|
gio_querymodules_SOURCES = gio-querymodules.c
|
|
|
|
|
gio_querymodules_LDADD = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
|
|
|
|
libgio-2.0.la \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-04-23 23:27:26 +02:00
|
|
|
glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
|
|
|
|
|
glib_compile_schemas_SOURCES = \
|
2010-04-17 05:17:01 +02:00
|
|
|
gvdb/gvdb-format.h \
|
|
|
|
|
gvdb/gvdb-builder.h \
|
|
|
|
|
gvdb/gvdb-builder.c \
|
2010-09-09 22:12:45 +02:00
|
|
|
glib-compile-schemas.c
|
2010-04-16 05:35:49 +02:00
|
|
|
|
2010-04-22 07:15:54 +02:00
|
|
|
gsettings_LDADD = \
|
2010-04-21 02:54:53 +02:00
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
2010-05-10 09:48:49 +02:00
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
2010-04-21 02:54:53 +02:00
|
|
|
libgio-2.0.la
|
2010-04-22 07:15:54 +02:00
|
|
|
gsettings_SOURCES = gsettings-tool.c
|
2010-04-21 02:54:53 +02:00
|
|
|
|
2010-04-19 20:04:42 +02:00
|
|
|
schemadir = $(datadir)/glib-2.0/schemas
|
|
|
|
|
dist_schema_DATA = gschema.dtd
|
|
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
# gdbus(1) tool
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS += gdbus
|
|
|
|
|
gdbus_SOURCES = gdbus-tool.c
|
2010-05-15 10:13:28 +02:00
|
|
|
gdbus_LDADD = libgio-2.0.la \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la
|
2010-05-06 20:13:59 +02:00
|
|
|
|
|
|
|
|
completiondir = $(sysconfdir)/bash_completion.d
|
2010-06-27 22:00:20 +02:00
|
|
|
completion_SCRIPTS = \
|
|
|
|
|
gdbus-bash-completion.sh \
|
|
|
|
|
gsettings-bash-completion.sh
|
2010-05-06 20:13:59 +02:00
|
|
|
EXTRA_DIST += $(completion_SCRIPTS)
|
|
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
|
2010-03-21 15:11:49 +01:00
|
|
|
dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
|
2010-02-03 23:37:13 +01:00
|
|
|
files='$(BUILT_EXTRA_DIST)'; \
|
|
|
|
|
for f in $$files; do \
|
|
|
|
|
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
|
|
|
|
cp $$d/$$f $(distdir) || exit 1; done
|
2010-01-12 13:11:22 +01:00
|
|
|
|
2010-03-21 15:11:49 +01:00
|
|
|
../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
|
2010-06-22 11:13:21 +02:00
|
|
|
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
|
2010-03-21 15:11:49 +01:00
|
|
|
case $$F in \
|
2010-05-03 18:56:46 +02:00
|
|
|
gunix*.c|gdesktopappinfo.c) ;; \
|
2010-03-21 15:11:49 +01:00
|
|
|
*.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
|
|
|
|
|
;; \
|
|
|
|
|
esac; \
|
2010-05-03 18:56:46 +02:00
|
|
|
done | sort -u >libgio.sourcefiles
|
2010-03-21 15:11:49 +01:00
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
|
2010-05-03 18:56:46 +02:00
|
|
|
rm libgio.sourcefiles
|
2010-03-21 15:11:49 +01:00
|
|
|
|
2009-06-22 21:33:41 +02:00
|
|
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
|
|
|
|
install-data-hook:
|
|
|
|
|
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
|
|
|
|
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
2009-09-30 05:06:45 +02:00
|
|
|
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
2009-06-22 21:33:41 +02:00
|
|
|
rm -f $(DESTDIR)$(libdir)/libgio-2.0.so
|
2009-09-30 05:06:45 +02:00
|
|
|
ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgio-2.0.so
|
2009-06-22 21:33:41 +02:00
|
|
|
endif
|
