summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-12-20 08:52:22 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-12-20 08:52:22 +0000
commitfaaf7894836bea18f7321c544846dc241834fa67 (patch)
tree87257fd96cd717ccd4b278363fdb3cfea3c4c62f
parent919db5e7ed56d250e99cd75e5a8c02795410008a (diff)
downloadgvfs-faaf7894836bea18f7321c544846dc241834fa67.tar.gz
Build without cdda. Patch from nf2@scheinwelt.at
2007-12-20 Alexander Larsson <alexl@redhat.com> * daemon/Makefile.am: Build without cdda. Patch from nf2@scheinwelt.at svn path=/trunk/; revision=1055
-rw-r--r--ChangeLog6
-rw-r--r--daemon/Makefile.am12
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 34d496b2..14de8ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-20 Alexander Larsson <alexl@redhat.com>
+
+ * daemon/Makefile.am:
+ Build without cdda.
+ Patch from nf2@scheinwelt.at
+
2007-12-19 David Zeuthen <davidz@redhat.com>
Add missing files from previous patch.
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7e503188..37ad5bbc 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -30,10 +30,10 @@ service_DATA = gvfs-daemon.service
mountdir = $(sysconfdir)/gvfs/mounts
-libexec_PROGRAMS=gvfsd gvfsd-ftp gvfsd-sftp gvfsd-trash gvfsd-cdda
+libexec_PROGRAMS=gvfsd gvfsd-ftp gvfsd-sftp gvfsd-trash
-mount_in_files = ftp.mount.in sftp.mount.in trash.mount.in cdda.mount.in
-mount_DATA = ftp.mount sftp.mount trash.mount cdda.mount
+mount_in_files = ftp.mount.in sftp.mount.in trash.mount.in
+mount_DATA = ftp.mount sftp.mount trash.mount
if HAVE_SAMBA
mount_in_files += smb.mount.in smb-browse.mount.in
@@ -41,6 +41,12 @@ mount_DATA += smb.mount smb-browse.mount
libexec_PROGRAMS += gvfsd-smb-browse gvfsd-smb
endif
+if USE_CDDA
+mount_in_files += cdda.mount.in
+mount_DATA += cdda.mount
+libexec_PROGRAMS += gvfsd-cdda
+endif
+
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files)
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)