24 files changed, 9 insertions, 13 deletions
diff --git a/bin/bbackupquery/Makefile.extra b/bin/bbackupquery/Makefile.extra
deleted file mode 100644
index e1049b6d..00000000
--- a/bin/bbackupquery/Makefile.extra
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# AUTOGEN SEEDING
-autogen_Documentation.cpp:	makedocumentation.pl documentation.txt
-	$(_PERL) makedocumentation.pl
-
-
diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt
index d00d90b0..22818a78 100644
--- a/infrastructure/cmake/CMakeLists.txt
+++ b/infrastructure/cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ set(files_to_configure
 	test/bbackupd/testfiles/bbackupd-symlink.conf
 	test/bbackupd/testfiles/bbackupd-temploc.conf
 	bin/bbackupd/bbackupd-config
-	bin/bbackupquery/makedocumentation.pl
+	lib/bbackupquery/makedocumentation.pl
 	bin/bbstored/bbstored-certs
 	bin/bbstored/bbstored-config
 	contrib/debian/bbackupd
@@ -115,7 +115,7 @@ foreach(protocol_file ${protocol_files})
 endforeach()
 
 set(documentation_files
-	bin/bbackupquery/documentation.txt
+	lib/bbackupquery/documentation.txt
 )
 
 foreach(documentation_file ${documentation_files})
@@ -127,7 +127,7 @@ foreach(documentation_file ${documentation_files})
 	set(output_file "${base_dir}/${CMAKE_MATCH_1}/autogen_${CMAKE_MATCH_2}.cpp")
 	add_custom_command(OUTPUT "${output_file}"
 		MAIN_DEPENDENCY "${base_dir}/${documentation_file}"
-		COMMAND ${PERL_EXECUTABLE} "${base_dir}/bin/bbackupquery/makedocumentation.pl"
+		COMMAND ${PERL_EXECUTABLE} "${base_dir}/lib/bbackupquery/makedocumentation.pl"
 		WORKING_DIRECTORY "${base_dir}/${CMAKE_MATCH_1}")
 
 	string(REPLACE "/" "_" module_name ${CMAKE_MATCH_1})
diff --git a/bin/bbackupd/BackupClientContext.cpp b/lib/bbackupd/BackupClientContext.cpp
index 4c0b01ce..4c0b01ce 100644
--- a/bin/bbackupd/BackupClientContext.cpp
+++ b/lib/bbackupd/BackupClientContext.cpp
diff --git a/bin/bbackupd/BackupClientContext.h b/lib/bbackupd/BackupClientContext.h
index df43a232..df43a232 100644
--- a/bin/bbackupd/BackupClientContext.h
+++ b/lib/bbackupd/BackupClientContext.h
diff --git a/bin/bbackupd/BackupClientDeleteList.cpp b/lib/bbackupd/BackupClientDeleteList.cpp
index ce5e6264..ce5e6264 100644
--- a/bin/bbackupd/BackupClientDeleteList.cpp
+++ b/lib/bbackupd/BackupClientDeleteList.cpp
diff --git a/bin/bbackupd/BackupClientDeleteList.h b/lib/bbackupd/BackupClientDeleteList.h
index b0fbf51a..b0fbf51a 100644
--- a/bin/bbackupd/BackupClientDeleteList.h
+++ b/lib/bbackupd/BackupClientDeleteList.h
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/lib/bbackupd/BackupClientDirectoryRecord.cpp
index 94cb7965..94cb7965 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.cpp
+++ b/lib/bbackupd/BackupClientDirectoryRecord.cpp
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.h b/lib/bbackupd/BackupClientDirectoryRecord.h
index 865fc747..865fc747 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.h
+++ b/lib/bbackupd/BackupClientDirectoryRecord.h
diff --git a/bin/bbackupd/BackupClientInodeToIDMap.cpp b/lib/bbackupd/BackupClientInodeToIDMap.cpp
index 6eaf7394..6eaf7394 100644
--- a/bin/bbackupd/BackupClientInodeToIDMap.cpp
+++ b/lib/bbackupd/BackupClientInodeToIDMap.cpp
diff --git a/bin/bbackupd/BackupClientInodeToIDMap.h b/lib/bbackupd/BackupClientInodeToIDMap.h
index 4bb1e085..4bb1e085 100644
--- a/bin/bbackupd/BackupClientInodeToIDMap.h
+++ b/lib/bbackupd/BackupClientInodeToIDMap.h
diff --git a/bin/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp
index 03ce7454..03ce7454 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/lib/bbackupd/BackupDaemon.cpp
diff --git a/bin/bbackupd/BackupDaemon.h b/lib/bbackupd/BackupDaemon.h
index ffe31247..ffe31247 100644
--- a/bin/bbackupd/BackupDaemon.h
+++ b/lib/bbackupd/BackupDaemon.h
diff --git a/bin/bbackupd/BackupDaemonInterface.h b/lib/bbackupd/BackupDaemonInterface.h
index d5c47c85..d5c47c85 100644
--- a/bin/bbackupd/BackupDaemonInterface.h
+++ b/lib/bbackupd/BackupDaemonInterface.h
diff --git a/bin/bbackupd/Win32BackupService.cpp b/lib/bbackupd/Win32BackupService.cpp
index 6d027abf..6d027abf 100644
--- a/bin/bbackupd/Win32BackupService.cpp
+++ b/lib/bbackupd/Win32BackupService.cpp
diff --git a/bin/bbackupd/Win32BackupService.h b/lib/bbackupd/Win32BackupService.h
index e7f077f2..e7f077f2 100644
--- a/bin/bbackupd/Win32BackupService.h
+++ b/lib/bbackupd/Win32BackupService.h
diff --git a/bin/bbackupd/Win32ServiceFunctions.cpp b/lib/bbackupd/Win32ServiceFunctions.cpp
index 2df914a7..2df914a7 100644
--- a/bin/bbackupd/Win32ServiceFunctions.cpp
+++ b/lib/bbackupd/Win32ServiceFunctions.cpp
diff --git a/bin/bbackupd/Win32ServiceFunctions.h b/lib/bbackupd/Win32ServiceFunctions.h
index e04c368f..e04c368f 100644
--- a/bin/bbackupd/Win32ServiceFunctions.h
+++ b/lib/bbackupd/Win32ServiceFunctions.h
diff --git a/bin/bbackupquery/BackupQueries.cpp b/lib/bbackupquery/BackupQueries.cpp
index bcb1827e..bcb1827e 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/lib/bbackupquery/BackupQueries.cpp
diff --git a/bin/bbackupquery/BackupQueries.h b/lib/bbackupquery/BackupQueries.h
index 96df34f5..96df34f5 100644
--- a/bin/bbackupquery/BackupQueries.h
+++ b/lib/bbackupquery/BackupQueries.h
diff --git a/bin/bbackupquery/BoxBackupCompareParams.h b/lib/bbackupquery/BoxBackupCompareParams.h
index 655df947..655df947 100644
--- a/bin/bbackupquery/BoxBackupCompareParams.h
+++ b/lib/bbackupquery/BoxBackupCompareParams.h
diff --git a/bin/bbackupquery/CommandCompletion.cpp b/lib/bbackupquery/CommandCompletion.cpp
index 761fc97e..761fc97e 100644
--- a/bin/bbackupquery/CommandCompletion.cpp
+++ b/lib/bbackupquery/CommandCompletion.cpp
diff --git a/bin/bbackupquery/documentation.txt b/lib/bbackupquery/documentation.txt
index b16a6f7c..b16a6f7c 100644
--- a/bin/bbackupquery/documentation.txt
+++ b/lib/bbackupquery/documentation.txt
diff --git a/bin/bbackupquery/makedocumentation.pl.in b/lib/bbackupquery/makedocumentation.pl.in
index 530c4ff6..530c4ff6 100755
--- a/bin/bbackupquery/makedocumentation.pl.in
+++ b/lib/bbackupquery/makedocumentation.pl.in
diff --git a/modules.txt b/modules.txt
index 25a9a979..c5ed163e 100644
--- a/modules.txt
+++ b/modules.txt
@@ -27,19 +27,21 @@ test/basicserver	qdbm	lib/server
 
 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
 
 bin/bbackupobjdump	lib/backupclient
 bin/bbstored		lib/backupstore
 bin/bbstoreaccounts	lib/backupclient
-bin/bbackupd		lib/backupclient	qdbm
-bin/bbackupquery	lib/backupclient
-bin/bbackupctl		lib/backupclient	qdbm	bin/bbackupd
+bin/bbackupd		lib/bbackupd
+bin/bbackupquery	lib/bbackupquery
+bin/bbackupctl		lib/backupclient	qdbm	lib/bbackupd
 
 test/backupstore	bin/bbstored	bin/bbstoreaccounts lib/server lib/backupstore lib/backupclient lib/raidfile
 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/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
 bin/s3simulator		lib/httpserver
 test/s3store		lib/backupclient lib/httpserver bin/s3simulator bin/bbstoreaccounts