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 /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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b4f0587ca3f..44506dfd0e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec -SUBDIRS = argp-standalone libglusterfs $(LIBGLUSTERFSCLIENT_SUBDIR) xlators scheduler transport auth glusterfsd $(GF_BOOSTER_SUBDIR) doc extras +SUBDIRS = argp-standalone libglusterfs $(LIBGLUSTERFSCLIENT_SUBDIR) xlators scheduler transport auth glusterfsd $(GF_BOOSTER_SUBDIR) $(FUSERMOUNT_SUBDIR) doc extras CLEANFILES = |