collect autolabor plugins into one directory

these plugins all share code, moving them into a common directory will make refactoring the code shared between them more straightforward

plugins/CMakeLists.txt

@@ -88,8 +88,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(autodump autodump.cpp)
     dfhack_plugin(autofarm autofarm.cpp)
     dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
-    dfhack_plugin(autohauler autohauler.cpp)
+    add_subdirectory(autolabor)
-    dfhack_plugin(autolabor autolabor.cpp)
     dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
     dfhack_plugin(automelt automelt.cpp)
     dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
@@ -133,7 +132,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(infiniteSky infiniteSky.cpp)
     dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
     dfhack_plugin(jobutils jobutils.cpp)
-    add_subdirectory(labormanager)
     dfhack_plugin(lair lair.cpp)
     dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)
     dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread)

plugins/autolabor/CMakeLists.txt

@@ -0,0 +1,16 @@
+project(autolahor)
+# A list of source files
+set(COMMON_SRCS
+)
+# A list of headers
+set(COMMON_HDRS
+)
+set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+# mash them together (headers are marked as headers and nothing will try to compile them)
+list(APPEND COMMON_SRCS ${COMMON_HDRS})
+
+dfhack_plugin(labormanager labormanager.cpp joblabormapper.cpp ${COMMON_SRCS})
+
+dfhack_plugin(autohauler autohauler.cpp ${COMMON_SRCS})
+dfhack_plugin(autolabor autolabor.cpp ${COMMON_SRCS})

plugins/labormanager/CMakeLists.txt

@@ -1,17 +0,0 @@
-project(labormanager)
-# A list of source files
-set(PROJECT_SRCS
-    labormanager.cpp
-    joblabormapper.cpp
-)
-# A list of headers
-set(PROJECT_HDRS
-    labormanager.h
-    joblabormapper.h
-)
-set_source_files_properties(${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-list(APPEND PROJECT_SRCS ${PROJECT_HDRS})
-
-dfhack_plugin(labormanager ${PROJECT_SRCS})