Fix CodeView library name and non-CMake builds
llvm-svn: 256387
diff --git a/llvm/lib/DebugInfo/CodeView/CMakeLists.txt b/llvm/lib/DebugInfo/CodeView/CMakeLists.txt
index 7853949..cfa0e4d 100644
--- a/llvm/lib/DebugInfo/CodeView/CMakeLists.txt
+++ b/llvm/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 @@
MethodListRecordBuilder.cpp
TypeRecordBuilder.cpp
TypeTableBuilder.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/CodeView
)
diff --git a/llvm/lib/DebugInfo/CodeView/LLVMBuild.txt b/llvm/lib/DebugInfo/CodeView/LLVMBuild.txt
index 8df016c..4db2337 100644
--- a/llvm/lib/DebugInfo/CodeView/LLVMBuild.txt
+++ b/llvm/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/llvm/lib/DebugInfo/CodeView/Makefile b/llvm/lib/DebugInfo/CodeView/Makefile
new file mode 100644
index 0000000..535bc10
--- /dev/null
+++ b/llvm/lib/DebugInfo/CodeView/Makefile
@@ -0,0 +1,14 @@
+##===- lib/DebugInfo/CodeView/Makefile ---------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+LIBRARYNAME = LLVMDebugInfoCodeView
+BUILD_ARCHIVE := 1
+
+include $(LEVEL)/Makefile.common