diff options
| author | Anand V. Avati <avati@dev.gluster.com> | 2009-08-17 15:25:44 -0700 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2009-08-17 15:25:44 -0700 |
| commit | a31b0016347b3bc9b341fa0f4541ed137224f593 (patch) | |
| tree | 3e1faf06a3e14e5022048886ecfa49267c92c986 /xlators/mount/fuse/src/Makefile.am | |
| parent | 862cbb38375f0176582b06019ba406818d236828 (diff) | |
| parent | 10824751f8669e7c39ebd46ab698ed0abd4e5165 (diff) | |
Merge branch 'fusilli' of /data/git/users/csaba/glusterfs-fusilli
Conflicts:
xlators/mount/fuse/src/fuse-bridge.c
Diffstat (limited to 'xlators/mount/fuse/src/Makefile.am')
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 9d8d45e4f..a4d1fd760 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,13 +1,14 @@ - -noinst_HEADERS = fuse-extra.h +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-extra.c -fuse_la_LDFLAGS = -module -avoidversion -shared -nostartfiles $(GF_FUSE_LDADD) +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 \ - -I$(top_srcdir)/libglusterfs/src $(GF_CFLAGS) -DFUSE_USE_VERSION=26 + -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ + $(GF_CFLAGS) -DFUSERMOUNT_DIR=\"$(bindir)\" CLEANFILES = |