From e90da2bff1e8e93864557388e44e45729e464a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 24 Mar 2012 01:29:09 +0100
Subject: [PATCH] Move autolabor to main plugin folder

---
 plugins/CMakeLists.txt                |  7 ++----
 plugins/{autolabor => }/autolabor.cpp |  0
 plugins/autolabor/CMakeLists.txt      | 31 ---------------------------
 plugins/autolabor/autolabor.h         |  1 -
 4 files changed, 2 insertions(+), 37 deletions(-)
 rename plugins/{autolabor => }/autolabor.cpp (100%)
 delete mode 100644 plugins/autolabor/CMakeLists.txt
 delete mode 100644 plugins/autolabor/autolabor.h

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 03cf9ee0d..ff03de3e6 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -45,11 +45,6 @@ if (BUILD_DWARFEXPORT)
     add_subdirectory (dwarfexport)
 endif()
 
-OPTION(BUILD_AUTOLABOR "Build autolabor." ON)
-if (BUILD_AUTOLABOR)
-    add_subdirectory (autolabor)
-endif()
-
 # Protobuf
 FILE(GLOB PROJECT_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/proto/*.proto)
 
@@ -72,6 +67,8 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(probe probe.cpp)
     # this is a plugin which helps detect cursed creatures (vampires, necromancers, werebeasts, ...)
     DFHACK_PLUGIN(cursecheck cursecheck.cpp)
+    # automatically assign labors to dwarves!
+    DFHACK_PLUGIN(autolabor autolabor.cpp)
     DFHACK_PLUGIN(drybuckets drybuckets.cpp)
     DFHACK_PLUGIN(getplants getplants.cpp)
     DFHACK_PLUGIN(plants plants.cpp)
diff --git a/plugins/autolabor/autolabor.cpp b/plugins/autolabor.cpp
similarity index 100%
rename from plugins/autolabor/autolabor.cpp
rename to plugins/autolabor.cpp
diff --git a/plugins/autolabor/CMakeLists.txt b/plugins/autolabor/CMakeLists.txt
deleted file mode 100644
index 124e36bbe..000000000
--- a/plugins/autolabor/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-PROJECT (autolabor)
-# A list of source files
-SET(PROJECT_SRCS
-    autolabor.cpp
-)
-# A list of headers
-SET(PROJECT_HDRS
-    autolabor.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})
-
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
-# this makes sure all the stuff is put in proper places and linked to dfhack
-DFHACK_PLUGIN(autolabor ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})
diff --git a/plugins/autolabor/autolabor.h b/plugins/autolabor/autolabor.h
deleted file mode 100644
index 7b9637ef9..000000000
--- a/plugins/autolabor/autolabor.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
\ No newline at end of file