diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-02-15 16:26:46 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-02-15 16:26:46 +0000 |
| commit | f4e91dd5b16470bf6c3b5e6a01ff9e0804335bfc (patch) | |
| tree | 64e0b689f5437bbb89746bdc312579f14cf15938 /netfs/fuse | |
| parent | Refactor to make more testable (diff) | |
| download | netfs-f4e91dd5b16470bf6c3b5e6a01ff9e0804335bfc.tar.bz2 netfs-f4e91dd5b16470bf6c3b5e6a01ff9e0804335bfc.tar.xz netfs-f4e91dd5b16470bf6c3b5e6a01ff9e0804335bfc.zip | |
Rename configs for uniqueness
Diffstat (limited to 'netfs/fuse')
| -rw-r--r-- | netfs/fuse/Jamfile.jam | 12 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.h | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseConfig.ice (renamed from netfs/fuse/configuration.ice) | 0 |
3 files changed, 8 insertions, 6 deletions
diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index acf757d..737c6c8 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -11,8 +11,8 @@ cpp-pch pch : pch.hpp : <library>..//Ice ; -obj configuration : - configuration.ice +lib netfsClientConfiguration : + fuseConfig.ice : <slicer>yes <library>..//Ice @@ -28,7 +28,7 @@ obj configuration : lib netfsClient : pch - configuration + netfsClientConfiguration [ glob *.cpp : netfs.cpp ] [ glob ../../libfusepp/fuse*.cpp ] : @@ -36,7 +36,8 @@ lib netfsClient : <include>../../libmisc <include>../../libfusepp <implicit-dependency>../ice//netfsComms - <implicit-dependency>configuration + <library>netfsClientConfiguration + <implicit-dependency>netfsClientConfiguration <library>../ice//netfsComms <library>../lib//netfsCommon <library>..//boost_thread @@ -53,7 +54,8 @@ lib netfsClient : <include>../../libfusepp <library>../ice//netfsComms <implicit-dependency>../ice//netfsComms - <implicit-dependency>configuration + <library>netfsClientConfiguration + <implicit-dependency>netfsClientConfiguration <define>_FILE_OFFSET_BITS=64 <library>fuse ; diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index f438910..4eb01ff 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -5,7 +5,7 @@ #include <Ice/Ice.h> #include <service.h> #include "fuseAppBase.h" -#include "configuration.h" +#include "fuseConfig.h" #include "cache.h" namespace NetFS { diff --git a/netfs/fuse/configuration.ice b/netfs/fuse/fuseConfig.ice index db37770..db37770 100644 --- a/netfs/fuse/configuration.ice +++ b/netfs/fuse/fuseConfig.ice |