Major refactoring to make lib/backupclient depend on lib/backupstore rather

than the other way around. This is needed to allow clients to have all the
code that they'd need to implement local backups (using the Local protocol)
in subsequent commits.

30 files changed, 12 insertions, 17 deletions

diff --git a/bin/bbstored/Makefile.extra b/bin/bbstored/Makefile.extra
deleted file mode 100644
index 6562647d..00000000
--- a/bin/bbstored/Makefile.extra
+++ /dev/null
@@ -1,9 +0,0 @@
-
-MAKEPROTOCOL = ../../lib/server/makeprotocol.pl
-
-GEN_CMD_SRV = $(MAKEPROTOCOL) Server backupprotocol.txt
-
-# AUTOGEN SEEDING
-autogen_BackupProtocolServer.cpp autogen_BackupProtocolServer.h:	$(MAKEPROTOCOL) backupprotocol.txt
-	$(_PERL) $(GEN_CMD_SRV)
-
diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupstore/BackupClientFileAttributes.cpp
index 0d7df4d7..0d7df4d7 100644
--- a/lib/backupclient/BackupClientFileAttributes.cpp
+++ b/lib/backupstore/BackupClientFileAttributes.cpp
diff --git a/lib/backupclient/BackupClientFileAttributes.h b/lib/backupstore/BackupClientFileAttributes.h
index f9a0d883..f9a0d883 100644
--- a/lib/backupclient/BackupClientFileAttributes.h
+++ b/lib/backupstore/BackupClientFileAttributes.h
diff --git a/bin/bbstored/BackupCommands.cpp b/lib/backupstore/BackupCommands.cpp
index 34f813df..34f813df 100644
--- a/bin/bbstored/BackupCommands.cpp
+++ b/lib/backupstore/BackupCommands.cpp
diff --git a/bin/bbstored/BackupConstants.h b/lib/backupstore/BackupConstants.h
index 19d06a15..19d06a15 100644
--- a/bin/bbstored/BackupConstants.h
+++ b/lib/backupstore/BackupConstants.h
diff --git a/lib/backupclient/BackupStoreConstants.h b/lib/backupstore/BackupStoreConstants.h
index 2c33fd8f..2c33fd8f 100644
--- a/lib/backupclient/BackupStoreConstants.h
+++ b/lib/backupstore/BackupStoreConstants.h
diff --git a/bin/bbstored/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp
index 9a98decf..a62655d3 100644
--- a/bin/bbstored/BackupStoreContext.cpp
+++ b/lib/backupstore/BackupStoreContext.cpp
@@ -13,7 +13,6 @@
 
 #include "BackupConstants.h"
 #include "BackupStoreContext.h"
-#include "BackupStoreDaemon.h"
 #include "BackupStoreDirectory.h"
 #include "BackupStoreException.h"
 #include "BackupStoreFile.h"
@@ -28,8 +27,9 @@
 #include "RaidFileWrite.h"
 #include "StoreStructure.h"
 
-#include "MemLeakFindOn.h"
+class BackupStoreDaemon;
 
+#include "MemLeakFindOn.h"
 
 // Maximum number of directories to keep in the cache
 // When the cache is bigger than this, everything gets
diff --git a/bin/bbstored/BackupStoreContext.h b/lib/backupstore/BackupStoreContext.h
index 44a05dd8..44a05dd8 100644
--- a/bin/bbstored/BackupStoreContext.h
+++ b/lib/backupstore/BackupStoreContext.h
diff --git a/lib/backupclient/BackupStoreDirectory.cpp b/lib/backupstore/BackupStoreDirectory.cpp
index 0d06da34..0d06da34 100644
--- a/lib/backupclient/BackupStoreDirectory.cpp
+++ b/lib/backupstore/BackupStoreDirectory.cpp
diff --git a/lib/backupclient/BackupStoreDirectory.h b/lib/backupstore/BackupStoreDirectory.h
index 0dfe6422..0dfe6422 100644
--- a/lib/backupclient/BackupStoreDirectory.h
+++ b/lib/backupstore/BackupStoreDirectory.h
diff --git a/lib/backupclient/BackupStoreException.h b/lib/backupstore/BackupStoreException.h
index 981dfa60..981dfa60 100644
--- a/lib/backupclient/BackupStoreException.h
+++ b/lib/backupstore/BackupStoreException.h
diff --git a/lib/backupclient/BackupStoreException.txt b/lib/backupstore/BackupStoreException.txt
index ece772c0..ece772c0 100644
--- a/lib/backupclient/BackupStoreException.txt
+++ b/lib/backupstore/BackupStoreException.txt
diff --git a/lib/backupclient/BackupStoreFile.cpp b/lib/backupstore/BackupStoreFile.cpp
index bd62b7ba..bd62b7ba 100644
--- a/lib/backupclient/BackupStoreFile.cpp
+++ b/lib/backupstore/BackupStoreFile.cpp
diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupstore/BackupStoreFile.h
index f5bc1924..f5bc1924 100644
--- a/lib/backupclient/BackupStoreFile.h
+++ b/lib/backupstore/BackupStoreFile.h
diff --git a/lib/backupclient/BackupStoreFileCryptVar.cpp b/lib/backupstore/BackupStoreFileCryptVar.cpp
index e826de4e..e826de4e 100644
--- a/lib/backupclient/BackupStoreFileCryptVar.cpp
+++ b/lib/backupstore/BackupStoreFileCryptVar.cpp
diff --git a/lib/backupclient/BackupStoreFileCryptVar.h b/lib/backupstore/BackupStoreFileCryptVar.h
index 566813c8..566813c8 100644
--- a/lib/backupclient/BackupStoreFileCryptVar.h
+++ b/lib/backupstore/BackupStoreFileCryptVar.h
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupstore/BackupStoreFileEncodeStream.cpp
index e9d773f0..e9d773f0 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.cpp
+++ b/lib/backupstore/BackupStoreFileEncodeStream.cpp
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.h b/lib/backupstore/BackupStoreFileEncodeStream.h
index 023994af..023994af 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.h
+++ b/lib/backupstore/BackupStoreFileEncodeStream.h
diff --git a/lib/backupclient/BackupStoreFileRevDiff.cpp b/lib/backupstore/BackupStoreFileRevDiff.cpp
index 509eef61..509eef61 100644
--- a/lib/backupclient/BackupStoreFileRevDiff.cpp
+++ b/lib/backupstore/BackupStoreFileRevDiff.cpp
diff --git a/lib/backupclient/BackupStoreFileWire.h b/lib/backupstore/BackupStoreFileWire.h
index 49e94aa5..49e94aa5 100644
--- a/lib/backupclient/BackupStoreFileWire.h
+++ b/lib/backupstore/BackupStoreFileWire.h
diff --git a/lib/backupclient/BackupStoreFilename.cpp b/lib/backupstore/BackupStoreFilename.cpp
index 72cd1acd..72cd1acd 100644
--- a/lib/backupclient/BackupStoreFilename.cpp
+++ b/lib/backupstore/BackupStoreFilename.cpp
diff --git a/lib/backupclient/BackupStoreFilename.h b/lib/backupstore/BackupStoreFilename.h
index 80db9516..80db9516 100644
--- a/lib/backupclient/BackupStoreFilename.h
+++ b/lib/backupstore/BackupStoreFilename.h
diff --git a/lib/backupclient/BackupStoreFilenameClear.cpp b/lib/backupstore/BackupStoreFilenameClear.cpp
index e529d8d3..e529d8d3 100644
--- a/lib/backupclient/BackupStoreFilenameClear.cpp
+++ b/lib/backupstore/BackupStoreFilenameClear.cpp
diff --git a/lib/backupclient/BackupStoreFilenameClear.h b/lib/backupstore/BackupStoreFilenameClear.h
index d4c45701..d4c45701 100644
--- a/lib/backupclient/BackupStoreFilenameClear.h
+++ b/lib/backupstore/BackupStoreFilenameClear.h
diff --git a/lib/backupclient/BackupStoreObjectMagic.h b/lib/backupstore/BackupStoreObjectMagic.h
index 7ee600a2..7ee600a2 100644
--- a/lib/backupclient/BackupStoreObjectMagic.h
+++ b/lib/backupstore/BackupStoreObjectMagic.h
diff --git a/lib/backupclient/Makefile.extra b/lib/backupstore/Makefile.extra
index df3319df..bc807fb6 100644
--- a/lib/backupclient/Makefile.extra
+++ b/lib/backupstore/Makefile.extra
@@ -1,12 +1,16 @@
 
 MAKEPROTOCOL = ../../lib/server/makeprotocol.pl
 
-GEN_CMD_SRV = $(MAKEPROTOCOL) Client ../../bin/bbstored/backupprotocol.txt
+GEN_CMD_CLI = $(MAKEPROTOCOL) Client backupprotocol.txt
+GEN_CMD_SRV = $(MAKEPROTOCOL) Server backupprotocol.txt
 
 # AUTOGEN SEEDING
-autogen_BackupProtocolClient.cpp autogen_BackupProtocolClient.h:	$(MAKEPROTOCOL) ../../bin/bbstored/backupprotocol.txt
-	$(_PERL) $(GEN_CMD_SRV)
+autogen_BackupProtocolClient.cpp autogen_BackupProtocolClient.h:	$(MAKEPROTOCOL) backupprotocol.txt
+	$(_PERL) $(GEN_CMD_CLI)
 
+# AUTOGEN SEEDING
+autogen_BackupProtocolServer.cpp autogen_BackupProtocolServer.h:	$(MAKEPROTOCOL) backupprotocol.txt
+	$(_PERL) $(GEN_CMD_SRV)
 
 MAKEEXCEPTION = ../../lib/common/makeexception.pl
 
diff --git a/lib/backupclient/RunStatusProvider.h b/lib/backupstore/RunStatusProvider.h
index 89f361ca..89f361ca 100644
--- a/lib/backupclient/RunStatusProvider.h
+++ b/lib/backupstore/RunStatusProvider.h
diff --git a/bin/bbstored/backupprotocol.txt b/lib/backupstore/backupprotocol.txt
index 011458e8..011458e8 100644
--- a/bin/bbstored/backupprotocol.txt
+++ b/lib/backupstore/backupprotocol.txt
diff --git a/modules.txt b/modules.txt
index ffc422b1..4563998a 100644
--- a/modules.txt
+++ b/modules.txt
@@ -25,8 +25,8 @@ test/basicserver	lib/server
 
 # Backup system
 
-lib/backupclient	lib/server	lib/crypto	lib/compress
-lib/backupstore		lib/server	lib/raidfile	lib/backupclient
+lib/backupstore		lib/server	lib/raidfile	lib/crypto	lib/compress
+lib/backupclient	lib/backupstore
 
 bin/bbackupobjdump	lib/backupclient lib/backupstore
 bin/bbstored		lib/raidfile	lib/server	lib/backupstore	lib/backupclient
diff --git a/test/bbackupd/Makefile.extra b/test/bbackupd/Makefile.extra
index 0ae56bd1..7db993c0 100644
--- a/test/bbackupd/Makefile.extra
+++ b/test/bbackupd/Makefile.extra
@@ -9,6 +9,6 @@ link-extra: ../../bin/bbackupd/autogen_ClientException.o \
 	../../bin/bbstored/BackupStoreContext.o \
 	../../bin/bbstored/BBStoreDHousekeeping.o \
 	../../bin/bbstored/HousekeepStoreAccount.o \
-	../../bin/bbstored/autogen_BackupProtocolServer.o \
+	../../lib/backupstore/autogen_BackupProtocolServer.o \
 	../../bin/bbstored/BackupCommands.o \
 	../../bin/bbstored/BackupStoreDaemon.o