diff options
| author | Csaba Henk <csaba@redhat.com> | 2012-05-15 13:41:57 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-05-21 13:47:41 -0700 |
| commit | 6012dfe6b9c4d69914078cc0b716bf11aac5e957 (patch) | |
| tree | b98aad92cc2fdaca12d72c5d05f1250ce6a6743a /xlators | |
| parent | 439d0426dd60ef6c1f4af13fcbbe73f1d206acc6 (diff) | |
fuse: reorganize mounting code
Macro-driven conditional compilation was a chaos.
New scheme is:
contrib/fuse-lib/mount-common.c:
libfuse routines used both by glusterfs and fusermount
contrib/fuse-lib/mount.c:
libfuse-derived but customized mounting code for glusterfs
contrib/fuse-util/mount_util.c:
libfuse routines used only by fusermount
Change-Id: I3e0ba7f74e36556b78244cd7676eb4d379939602
BUG: 762389
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: http://review.gluster.com/3342
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 7bb3931ec..c1865c745 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,15 +1,24 @@ -noinst_HEADERS = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\ - $(CONTRIBDIR)/fuse-include/fuse-mount.h\ +noinst_HEADERS_linux = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\ + $(CONTRIBDIR)/fuse-include/mount_util.h\ + $(CONTRIBDIR)/fuse-lib/mount-gluster-compat.h +noinst_HEADERS_darwin = $(CONTRIBDIR)/fuse-include/fuse_kernel_macfuse.h +noinst_HEADERS_common = $(CONTRIBDIR)/fuse-include/fuse-mount.h\ $(CONTRIBDIR)/fuse-include/fuse-misc.h fuse-mem-types.h \ fuse-bridge.h +if GF_DARWIN_HOST_OS + noinst_HEADERS = $(noinst_HEADERS_common) $(noinst_HEADERS_darwin) +else + noinst_HEADERS = $(noinst_HEADERS_common) $(noinst_HEADERS_darwin) +endif + xlator_LTLIBRARIES = fuse.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount if GF_DARWIN_HOST_OS mount_source=$(CONTRIBDIR)/macfuse/mount_darwin.c else - mount_source=$(CONTRIBDIR)/fuse-lib/mount.c + mount_source=$(CONTRIBDIR)/fuse-lib/mount.c $(CONTRIBDIR)/fuse-lib/mount-common.c endif fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ @@ -20,7 +29,7 @@ fuse_la_LIBADD = @GF_FUSE_LDADD@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ - $(GF_CFLAGS) $(GF_FUSE_CFLAGS) + -I$(CONTRIBDIR)/fuse-lib $(GF_CFLAGS) $(GF_FUSE_CFLAGS) CLEANFILES = |