diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2015-07-24 18:30:56 +0100 |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2015-08-04 20:57:51 +0100 |
| commit | fc5f3be0a55f15d567e2e01f65585a3de5c40e74 (patch) | |
| tree | 33798a2e2be88d6000534b69d944b58ff0bc2261 | |
| parent | 22e00c940eee58d52f231d6431d81c7dd3d05b40 (diff) | |
| download | gvfs-fc5f3be0a55f15d567e2e01f65585a3de5c40e74.tar.gz | |
build: Make EXTRA_DIST independent of configure results
Make EXTRA_DIST independent of configure results otherwise the output of
"make dist" could be broken if the system on which "make dist" is run
does not have all the libraries installed.
https://bugzilla.gnome.org/show_bug.cgi?id=752838
| -rw-r--r-- | daemon/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2d52f0a5..59f4a55d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -28,6 +28,8 @@ flags = $(AM_CPPFLAGS) gvfs_gschemas = gvfs_gschemas_convert = +gvfs_gschemas_dist = +gvfs_gschemas_convert_dist = # D-BUS service file %.service: %.service.in ../config.log @@ -64,6 +66,8 @@ libexec_PROGRAMS += gvfsd-http gvfsd-dav endif mount_in_files += smb.mount.in smb-browse.mount.in +gvfs_gschemas_dist += org.gnome.system.smb.gschema.xml +gvfs_gschemas_convert_dist += gvfs-smb.convert if HAVE_SAMBA mount_DATA += smb.mount smb-browse.mount libexec_PROGRAMS += gvfsd-smb-browse gvfsd-smb @@ -90,6 +94,8 @@ libexec_PROGRAMS += gvfsd-mtp endif mount_in_files += dns-sd.mount.in +gvfs_gschemas_dist += org.gnome.system.dns_sd.gschema.xml +gvfs_gschemas_convert_dist += gvfs-dns-sd.convert if HAVE_AVAHI mount_DATA += dns-sd.mount libexec_PROGRAMS += gvfsd-dnssd @@ -126,8 +132,8 @@ noinst_DATA = $(mount_DATA:.mount=.localmount) EXTRA_DIST = \ gvfs-daemon.service.in \ $(mount_in_files) \ - $(gvfs_gschemas) \ - $(gvfs_gschemas_convert_DATA) \ + $(gvfs_gschemas_dist) \ + $(gvfs_gschemas_convert_dist) \ $(gsettings_ENUM_FILES) \ $(NULL) |