summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-02-15 16:26:46 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-05-06 00:40:49 +0100
commit03db967ea616989ae1bac5c2bdb7a2e72d98885e (patch)
tree64e0b689f5437bbb89746bdc312579f14cf15938
parentRefactor to make more testable (diff)
downloadnetfs-03db967ea616989ae1bac5c2bdb7a2e72d98885e.tar.bz2
netfs-03db967ea616989ae1bac5c2bdb7a2e72d98885e.tar.xz
netfs-03db967ea616989ae1bac5c2bdb7a2e72d98885e.zip
Rename configs for uniqueness
-rw-r--r--netfs/daemon/Jamfile.jam2
-rw-r--r--netfs/daemon/daemon.h2
-rw-r--r--netfs/daemon/daemonConfig.ice (renamed from netfs/daemon/configuration.ice)0
-rw-r--r--netfs/daemon/daemonService.h2
-rw-r--r--netfs/fuse/Jamfile.jam12
-rw-r--r--netfs/fuse/fuseApp.h2
-rw-r--r--netfs/fuse/fuseConfig.ice (renamed from netfs/fuse/configuration.ice)0
7 files changed, 11 insertions, 9 deletions
diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam
index 07bdcee..53ac99d 100644
--- a/netfs/daemon/Jamfile.jam
+++ b/netfs/daemon/Jamfile.jam
@@ -11,7 +11,7 @@ cpp-pch pch : pch.hpp :
;
lib netfsdConfiguration :
- configuration.ice
+ daemonConfig.ice
:
<library>..//Ice
<library>..//IceUtil
diff --git a/netfs/daemon/daemon.h b/netfs/daemon/daemon.h
index 58d9f2f..a43d7cd 100644
--- a/netfs/daemon/daemon.h
+++ b/netfs/daemon/daemon.h
@@ -3,7 +3,7 @@
#include <Ice/Ice.h>
#include <IceBox/IceBox.h>
-#include <configuration.h>
+#include <daemonConfig.h>
#include <types.h>
#include <boost/filesystem/path.hpp>
diff --git a/netfs/daemon/configuration.ice b/netfs/daemon/daemonConfig.ice
index bb77344..bb77344 100644
--- a/netfs/daemon/configuration.ice
+++ b/netfs/daemon/daemonConfig.ice
diff --git a/netfs/daemon/daemonService.h b/netfs/daemon/daemonService.h
index ab52eee..345df2c 100644
--- a/netfs/daemon/daemonService.h
+++ b/netfs/daemon/daemonService.h
@@ -3,7 +3,7 @@
#include <service.h>
#include <entCache.h>
-#include <configuration.h>
+#include <daemonConfig.h>
class ServiceServer : public NetFS::Service {
public:
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