From d5910898f1602dc16ab158b06c37abcd98a0588a Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Mon, 13 Jul 2009 22:28:07 +0200 Subject: basic version of direct FUSE interface (ie. not relying on libfuse) --- xlators/mount/fuse/src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/mount/fuse/src/Makefile.am') diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 9d8d45e4f02..cc4fe9de683 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,10 +1,10 @@ -noinst_HEADERS = fuse-extra.h +noinst_HEADERS = fuse_kernel.h xlator_LTLIBRARIES = fuse.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount -fuse_la_SOURCES = fuse-bridge.c fuse-extra.c -fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles $(GF_FUSE_LDADD) +fuse_la_SOURCES = fuse-bridge.c +fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) -DFUSE_USE_VERSION=26 -- cgit From 472ac9944b2e99b8dd4a7e33f8dc4ae0f111b0cc Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Mon, 10 Aug 2009 19:46:45 -0700 Subject: fuse: move libfuse derived code over under contrib/ --- xlators/mount/fuse/src/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xlators/mount/fuse/src/Makefile.am') diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index cc4fe9de683..c1e7755b5f8 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,13 +1,16 @@ -noinst_HEADERS = fuse_kernel.h +CONTRIBDIR = $(top_srcdir)/contrib + +noinst_HEADERS = $(CONTRIBDIR)/fuse-include/fuse_kernel.h xlator_LTLIBRARIES = fuse.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount -fuse_la_SOURCES = fuse-bridge.c +fuse_la_SOURCES = fuse-bridge.c $(CONTRIBDIR)/fuse-lib/misc.c fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) -DFUSE_USE_VERSION=26 + -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ + $(GF_CFLAGS) -DFUSE_USE_VERSION=26 CLEANFILES = -- cgit From fbb636390fe51dc6aa52ec7523a36b183434a28c Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Tue, 11 Aug 2009 06:24:40 -0700 Subject: fuse: add proper mounting support, based on libfuse routines --- xlators/mount/fuse/src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators/mount/fuse/src/Makefile.am') diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index c1e7755b5f8..0231e7be0b9 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -5,7 +5,8 @@ noinst_HEADERS = $(CONTRIBDIR)/fuse-include/fuse_kernel.h xlator_LTLIBRARIES = fuse.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount -fuse_la_SOURCES = fuse-bridge.c $(CONTRIBDIR)/fuse-lib/misc.c +fuse_la_SOURCES = fuse-bridge.c $(CONTRIBDIR)/fuse-lib/misc.c \ + $(CONTRIBDIR)/fuse-lib/mount.c fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \ -- cgit From 901ba842cd6c42ff24e0539a1b8231b3e802e1ce Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Tue, 11 Aug 2009 18:26:11 -0700 Subject: bring in fusermount --- xlators/mount/fuse/src/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'xlators/mount/fuse/src/Makefile.am') diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 0231e7be0b9..a4d1fd76064 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,6 +1,3 @@ - -CONTRIBDIR = $(top_srcdir)/contrib - noinst_HEADERS = $(CONTRIBDIR)/fuse-include/fuse_kernel.h xlator_LTLIBRARIES = fuse.la @@ -11,7 +8,7 @@ fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles 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) -DFUSE_USE_VERSION=26 + $(GF_CFLAGS) -DFUSERMOUNT_DIR=\"$(bindir)\" CLEANFILES = -- cgit