Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.

diff --git a/fortune-mod/datfiles/CMakeLists.txt b/fortune-mod/datfiles/CMakeLists.txt
index 00aa83873cdefec5b5a239da019dad2d4af33864..9945c7219595feef0475eda66cf6e8a927ed6afb 100644 (file)
--- a/fortune-mod/datfiles/CMakeLists.txt
+++ b/fortune-mod/datfiles/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET (_strfile  "${CMAKE_CURRENT_BINARY_DIR}/../strfile")
+SET (_unrot_cookies )
 FOREACH(c ${COOKIES})
-    SET(TARGET_NAME "cookie__${c}")
     SET(DEST "${c}.dat")
     SET(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${c}")
 
@@ -36,10 +36,7 @@ FOREACH(c ${COOKIES})
     )
     endif()
 
-    ADD_CUSTOM_TARGET(
-        "${TARGET_NAME}" ALL
-        DEPENDS "${c}" "${DEST}" "${LINK}"
-    )
+    LIST(APPEND _unrot_cookies "${DEST}" "${LINK}")
 
     INSTALL(
         FILES "${c}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST}" "${CMAKE_CURRENT_BINARY_DIR}/${LINK}"
@@ -47,6 +44,12 @@ FOREACH(c ${COOKIES})
     )
 
 ENDFOREACH()
+
+ADD_CUSTOM_TARGET(
+    plain_cookies ALL
+    DEPENDS ${_unrot_cookies}
+)
+
 IF (NOT "${NO_OFFENSIVE}")
     ADD_SUBDIRECTORY("off")
 ENDIF()

diff --git a/fortune-mod/datfiles/off/CMakeLists.txt b/fortune-mod/datfiles/off/CMakeLists.txt
index be3b556b81b800f5adb046805950bb884e137f23..4119f368d18c49887b06ea31294f853731c65fe5 100644 (file)
--- a/fortune-mod/datfiles/off/CMakeLists.txt
+++ b/fortune-mod/datfiles/off/CMakeLists.txt
@@ -2,8 +2,9 @@ SET (_strfile  "${CMAKE_CURRENT_BINARY_DIR}/../../strfile")
 SET (_rot  "${CMAKE_CURRENT_BINARY_DIR}/../../rot")
 SET (rot_dir "${CMAKE_CURRENT_BINARY_DIR}/rotated")
 FILE(MAKE_DIRECTORY "${rot_dir}")
+SET (_rotated_cookies )
+SET (_install_rotated_cookies )
 FOREACH(c ${OFFENSIVE_COOKIES})
-    SET(TARGET_NAME "offensive_cookie__${c}")
     SET(rot_dest "${rot_dir}/${c}")
     SET(DEST "${c}.dat")
     SET(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/unrotated/${c}")
@@ -30,23 +31,24 @@ FOREACH(c ${OFFENSIVE_COOKIES})
         COMMAND ${CMAKE_COMMAND} -E copy "${rot_dest}" "${rot_LINK}"
         DEPENDS "${rot_dest}"
     )
-else()
-    ADD_CUSTOM_COMMAND(
-        OUTPUT "${rot_LINK}"
-        COMMAND "ln"
-        ARGS "-s" "${c}" "${LINK}"
-        DEPENDS "${rot_dest}"
-        WORKING_DIRECTORY "${rot_dir}"
-    )
-endif()
-    ADD_CUSTOM_TARGET(
-        "${TARGET_NAME}" ALL
-        DEPENDS "${rot_dest}" "${DEST}" "${rot_LINK}"
-    )
-
-    INSTALL(
-        FILES "${rot_dest}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST}" "${rot_LINK}"
-        DESTINATION "${LOCALODIR}"
-    )
-
+    else()
+        ADD_CUSTOM_COMMAND(
+            OUTPUT "${rot_LINK}"
+            COMMAND "ln"
+            ARGS "-s" "${c}" "${LINK}"
+            DEPENDS "${rot_dest}"
+            WORKING_DIRECTORY "${rot_dir}"
+        )
+    endif()
+    LIST(APPEND _rotated_cookies "${rot_dest}" "${DEST}" "${rot_LINK}")
+    LIST(APPEND _install_rotated_cookies "${rot_dest}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST}" "${rot_LINK}")
 ENDFOREACH()
+
+ADD_CUSTOM_TARGET(
+    offensive_cookies ALL
+    DEPENDS ${_rotated_cookies}
+)
+INSTALL(
+    FILES ${_install_rotated_cookies}
+    DESTINATION "${LOCALODIR}"
+)