From 0b18b346f90c6d3b42b7949e68bcd6d84ae66ecf Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Sun, 4 Dec 2011 20:45:31 +0100
Subject: [PATCH] Renamed ldruntime back to druntime-ldc, as the name is
 hardcoded in the source.

Also took the opportunity to rename liblphobos2 to libphobos2-ldc as discussed on IRC, because this highlights the relationship to DMD's libphobos2 better e.g. when browsing through the file system.
---
 ldc2_install.conf.in   |  4 ++--
 ldc2_phobos.conf.in    |  4 ++--
 runtime/CMakeLists.txt | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ldc2_install.conf.in b/ldc2_install.conf.in
index a7409bbbbfe..e9e6435d0b6 100644
--- a/ldc2_install.conf.in
+++ b/ldc2_install.conf.in
@@ -10,7 +10,7 @@ default:
         "-I@INCLUDE_INSTALL_DIR@/ldc",
         "-I@INCLUDE_INSTALL_DIR@",
         "-L-L@CMAKE_INSTALL_LIBDIR@", @MUTILIB_ADDITIONAL_INSTALL_PATH@
-        "-defaultlib=lphobos2",
-        "-debuglib=lphobos2"
+        "-defaultlib=phobos2-ldc",
+        "-debuglib=phobos2-ldc"
     ];
 };
diff --git a/ldc2_phobos.conf.in b/ldc2_phobos.conf.in
index 0399e7e06ea..d4400c026f1 100644
--- a/ldc2_phobos.conf.in
+++ b/ldc2_phobos.conf.in
@@ -12,7 +12,7 @@ default:
         "-I@RUNTIME_DIR@/src",
         "-I@PHOBOS2_DIR@/",
         "-L-L@PROJECT_BINARY_DIR@/../lib", @MUTILIB_ADDITIONAL_PATH@
-        "-defaultlib=lphobos2",
-        "-debuglib=lphobos2"
+        "-defaultlib=phobos2-ldc",
+        "-debuglib=phobos2-ldc"
     ];
 };
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 45f8e5ff435..771280b048d 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -44,7 +44,7 @@ set(PHOBOS2_DIR ${PROJECT_SOURCE_DIR}/phobos CACHE PATH "phobos2 source dir")
 set(RUNTIME_CC druntime-core)
 set(RUNTIME_GC druntime-gc-basic)
 set(RUNTIME_DC druntime-rt-ldc)
-set(RUNTIME_AIO ldruntime)
+set(RUNTIME_AIO druntime-ldc)
 set(RUNTIME_DC_DIR ${RUNTIME_DIR}/src/rt)
 set(RUNTIME_GC_DIR ${RUNTIME_DIR}/src/gc)
 set(RUNTIME_INCLUDE ${RUNTIME_DIR}/src)
@@ -298,7 +298,7 @@ macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix)
              dc(${f} PHOBOS2_O PHOBOS2_BC "${d_flags};-I${PHOBOS2_DIR}" ${PHOBOS2_DIR} "${target_suffix}")
         endforeach(f)
 
-        add_library(lphobos2${target_suffix} ${D_LIBRARY_TYPE}
+        add_library(phobos2-ldc${target_suffix} ${D_LIBRARY_TYPE}
             ${ZLIB_C}
             ${PHOBOS2_O}
             ${CORE_O}
@@ -307,10 +307,10 @@ macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix)
             ${DCRT_O}
             ${DCRT_C}
         )
-        add_dependencies(lphobos2${target_suffix} runtime)
+        add_dependencies(phobos2-ldc${target_suffix} runtime)
         set_target_properties(
-            lphobos2${target_suffix} PROPERTIES
-            OUTPUT_NAME lphobos2${lib_suffix}
+            phobos2-ldc${target_suffix} PROPERTIES
+            OUTPUT_NAME phobos2-ldc${lib_suffix}
             LINKER_LANGUAGE C
             ARCHIVE_OUTPUT_DIRECTORY ${output_path}
             LIBRARY_OUTPUT_DIRECTORY ${output_path}
@@ -318,8 +318,8 @@ macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix)
             COMPILE_FLAGS "${c_flags}"
             LINK_FLAGS "${ld_flags}"
         )
-        install(TARGETS lphobos2${target_suffix} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${path_suffix})
-        add_dependencies(phobos2 DEPENDS lphobos2${target_suffix})
+        install(TARGETS phobos2-ldc${target_suffix} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${path_suffix})
+        add_dependencies(phobos2 DEPENDS phobos2-ldc${target_suffix})
     endif(PHOBOS2_DIR)
 endmacro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix)