summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christian de Rivaz <jc@eclis.ch>2011-12-22 16:58:44 +0100
committerAlexander Larsson <alexl@redhat.com>2012-01-10 11:29:00 +0100
commitfb479cf0559c91bc0abd550e96f7aa9b156ba5e3 (patch)
tree3f3ac548b7d6594b2ce400f80aa59a58f0541dc2
parent9e2363b85534c2b3043f9ba1e78824b29ecc9957 (diff)
downloadgvfs-fb479cf0559c91bc0abd550e96f7aa9b156ba5e3.tar.gz
Make ftp.mount no longer conditionally built
It doesn't require libsoup anymore after all. This was missing in the ff120f07aa8807b96ba79b2415715205a92db2ae commit. Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch>
-rw-r--r--daemon/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b19ee891..79da0183 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -41,12 +41,12 @@ service_DATA = gvfs-daemon.service
libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
-mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
+mount_in_files = sftp.mount.in ftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
+mount_DATA = sftp.mount ftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
-mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in
+mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in
if HAVE_HTTP
-mount_DATA += http.mount dav.mount ftp.mount
+mount_DATA += http.mount dav.mount
if HAVE_AVAHI
mount_DATA += dav+sd.mount
endif