diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-12-20 17:27:10 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-12-20 17:27:10 +0000 |
| commit | 5b9a0c5ee886d0e6c2b6e72e9f875cd6529ee435 (patch) | |
| tree | 9359de5bbcc3554444afafa0da34051967e67e06 | |
| parent | a6ebab98c3c2b8ac10a8a43601eadced16ede91d (diff) | |
Move reusable files from bin/bbstored to lib/bbstored.
Break dependendency of test/bbackupd on individual files from other modules.
| -rw-r--r-- | lib/bbstored/BBStoreDHousekeeping.cpp (renamed from bin/bbstored/BBStoreDHousekeeping.cpp) | 0 | ||||
| -rw-r--r-- | lib/bbstored/BackupStoreDaemon.cpp (renamed from bin/bbstored/BackupStoreDaemon.cpp) | 0 | ||||
| -rw-r--r-- | lib/bbstored/BackupStoreDaemon.h (renamed from bin/bbstored/BackupStoreDaemon.h) | 0 | ||||
| -rw-r--r-- | modules.txt | 9 | ||||
| -rw-r--r-- | test/bbackupd/Makefile.extra | 17 |
5 files changed, 5 insertions, 21 deletions
diff --git a/bin/bbstored/BBStoreDHousekeeping.cpp b/lib/bbstored/BBStoreDHousekeeping.cpp index 86d6409c..86d6409c 100644 --- a/bin/bbstored/BBStoreDHousekeeping.cpp +++ b/lib/bbstored/BBStoreDHousekeeping.cpp diff --git a/bin/bbstored/BackupStoreDaemon.cpp b/lib/bbstored/BackupStoreDaemon.cpp index 8fddf125..8fddf125 100644 --- a/bin/bbstored/BackupStoreDaemon.cpp +++ b/lib/bbstored/BackupStoreDaemon.cpp diff --git a/bin/bbstored/BackupStoreDaemon.h b/lib/bbstored/BackupStoreDaemon.h index a2dab5e5..a2dab5e5 100644 --- a/bin/bbstored/BackupStoreDaemon.h +++ b/lib/bbstored/BackupStoreDaemon.h diff --git a/modules.txt b/modules.txt index c5ed163e..71ae16fd 100644 --- a/modules.txt +++ b/modules.txt @@ -29,9 +29,10 @@ lib/backupstore lib/server lib/raidfile lib/crypto lib/compress lib/httpserver lib/backupclient lib/backupstore lib/bbackupd lib/backupclient qdbm lib/bbackupquery lib/backupclient +lib/bbstored lib/backupstore bin/bbackupobjdump lib/backupclient -bin/bbstored lib/backupstore +bin/bbstored lib/bbstored bin/bbstoreaccounts lib/backupclient bin/bbackupd lib/bbackupd bin/bbackupquery lib/bbackupquery @@ -41,13 +42,13 @@ test/backupstore bin/bbstored bin/bbstoreaccounts lib/server lib/backupstore lib test/backupstorefix bin/bbstored bin/bbstoreaccounts lib/backupclient bin/bbackupquery bin/bbackupd bin/bbackupctl test/backupstorepatch bin/bbstored bin/bbstoreaccounts lib/backupclient test/backupdiff lib/backupclient -test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/bbackupquery lib/bbackupd lib/server lib/backupstore lib/backupclient lib/intercept +test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/bbackupquery lib/bbackupd lib/server lib/backupstore lib/backupclient lib/intercept lib/bbstored bin/s3simulator lib/httpserver test/s3store lib/backupclient lib/httpserver bin/s3simulator bin/bbstoreaccounts # HTTP server system -lib/httpserver lib/server -test/httpserver lib/httpserver +lib/httpserver lib/server +test/httpserver lib/httpserver # END_IF_DISTRIBUTION diff --git a/test/bbackupd/Makefile.extra b/test/bbackupd/Makefile.extra deleted file mode 100644 index ec64bfda..00000000 --- a/test/bbackupd/Makefile.extra +++ /dev/null @@ -1,17 +0,0 @@ -link-extra: \ - ../../bin/bbackupd/BackupClientContext.o \ - ../../bin/bbackupd/BackupClientDeleteList.o \ - ../../bin/bbackupd/BackupClientDirectoryRecord.o \ - ../../bin/bbackupd/Win32BackupService.o \ - ../../bin/bbackupd/BackupClientInodeToIDMap.o \ - ../../bin/bbackupd/Win32ServiceFunctions.o \ - ../../bin/bbackupd/BackupDaemon.o \ - ../../bin/bbstored/BBStoreDHousekeeping.o \ - ../../lib/backupstore/HousekeepStoreAccount.o \ - ../../lib/backupstore/autogen_BackupProtocol.o \ - ../../lib/backupstore/BackupStoreContext.o \ - ../../lib/backupstore/BackupCommands.o \ - ../../bin/bbstored/BackupStoreDaemon.o \ - ../../bin/bbackupquery/BackupQueries.o \ - ../../bin/bbackupquery/CommandCompletion.o \ - ../../bin/bbackupquery/autogen_Documentation.o |