Fix CodeView library name and non-CMake builds

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256387 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/DebugInfo/CodeView/CMakeLists.txt b/lib/DebugInfo/CodeView/CMakeLists.txt
index 7853949bdb5a8755f69af7b40012d07623be8226..cfa0e4d8b401aa735535a4be588a59632ccf4c33 100644 (file)
--- a/lib/DebugInfo/CodeView/CMakeLists.txt
+++ b/lib/DebugInfo/CodeView/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_library(LLVMCodeView
+add_llvm_library(LLVMDebugInfoCodeView
   FieldListRecordBuilder.cpp
   Line.cpp
   ListRecordBuilder.cpp
@@ -6,4 +6,7 @@ add_llvm_library(LLVMCodeView
   MethodListRecordBuilder.cpp
   TypeRecordBuilder.cpp
   TypeTableBuilder.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/CodeView
   )

diff --git a/lib/DebugInfo/CodeView/LLVMBuild.txt b/lib/DebugInfo/CodeView/LLVMBuild.txt
index 8df016c5c50b3c22727da76fef4ff3dbc1c6ec9f..4db23376fce4d78ef597aea8bf503b9b4fa3f178 100644 (file)
--- a/lib/DebugInfo/CodeView/LLVMBuild.txt
+++ b/lib/DebugInfo/CodeView/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/CodeView/LLVMBuild.txt -------------------------------*- Conf -*--===;
+;===- ./lib/DebugInfo/CodeView/LLVMBuild.txt -------------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,6 +17,6 @@
 
 [component_0]
 type = Library
-name = CodeView
-parent = Libraries
+name = DebugInfoCodeView
+parent = DebugInfo
 required_libraries = Support

diff --git a/lib/DebugInfo/CodeView/Makefile b/lib/DebugInfo/CodeView/Makefile
new file mode 100644 (file)
index 0000000..535bc10
--- /dev/null
+++ b/lib/DebugInfo/CodeView/Makefile
@@ -0,0 +1,14 @@
+##===- lib/DebugInfo/CodeView/Makefile ---------------------*- Makefile -*-===##\r
+#\r
+#                     The LLVM Compiler Infrastructure\r
+#\r
+# This file is distributed under the University of Illinois Open Source\r
+# License. See LICENSE.TXT for details.\r
+#\r
+##===----------------------------------------------------------------------===##\r
+\r
+LEVEL = ../../..\r
+LIBRARYNAME = LLVMDebugInfoCodeView\r
+BUILD_ARCHIVE := 1\r
+\r
+include $(LEVEL)/Makefile.common\r