diff --git a/llvm/lib/Target/CBackend/Makefile b/llvm/lib/Target/CBackend/Makefile
index 7fcc434..fc32db0 100644
--- a/llvm/lib/Target/CBackend/Makefile
+++ b/llvm/lib/Target/CBackend/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = cwriter
+LIBRARYNAME = LLVMCBackend
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Target/Makefile b/llvm/lib/Target/Makefile
index da74511..7c525ef 100644
--- a/llvm/lib/Target/Makefile
+++ b/llvm/lib/Target/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 PARALLEL_DIRS = CBackend X86 SparcV9 PowerPC Skeleton
-LIBRARYNAME = target
+LIBRARYNAME = LLVMTarget
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Target/PowerPC/Makefile b/llvm/lib/Target/PowerPC/Makefile
index 05768ab..9543281 100644
--- a/llvm/lib/Target/PowerPC/Makefile
+++ b/llvm/lib/Target/PowerPC/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = powerpc
+LIBRARYNAME = LLVMPowerPC
 TARGET = PowerPC
 
 # Make sure that tblgen is run, first thing.
diff --git a/llvm/lib/Target/Skeleton/Makefile b/llvm/lib/Target/Skeleton/Makefile
index bc9a16d..07ce6f2 100644
--- a/llvm/lib/Target/Skeleton/Makefile
+++ b/llvm/lib/Target/Skeleton/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = skeleton
+LIBRARYNAME = LLVMSkeleton
 
 TARGET = Skeleton
 # Make sure that tblgen is run, first thing.
diff --git a/llvm/lib/Target/SparcV9/InstrSched/Makefile b/llvm/lib/Target/SparcV9/InstrSched/Makefile
index 81caf77..ea2c3aa 100644
--- a/llvm/lib/Target/SparcV9/InstrSched/Makefile
+++ b/llvm/lib/Target/SparcV9/InstrSched/Makefile
@@ -9,6 +9,6 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9sched
+LIBRARYNAME = LLVMSparcV9InstrSched
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Target/SparcV9/LiveVar/Makefile b/llvm/lib/Target/SparcV9/LiveVar/Makefile
index 6973f63..a2a53e6 100644
--- a/llvm/lib/Target/SparcV9/LiveVar/Makefile
+++ b/llvm/lib/Target/SparcV9/LiveVar/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../../..
-LIBRARYNAME = sparcv9livevar
+LIBRARYNAME = LLVMSparcV9LiveVar
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Target/SparcV9/Makefile b/llvm/lib/Target/SparcV9/Makefile
index 363b73c..30ee869 100644
--- a/llvm/lib/Target/SparcV9/Makefile
+++ b/llvm/lib/Target/SparcV9/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = sparcv9
+LIBRARYNAME = LLVMSparcV9
 PARALLEL_DIRS = InstrSched LiveVar ModuloScheduling RegAlloc
 
 BUILT_SOURCES = \
diff --git a/llvm/lib/Target/SparcV9/ModuloScheduling/Makefile b/llvm/lib/Target/SparcV9/ModuloScheduling/Makefile
index 44bf5ed..2ec0503 100644
--- a/llvm/lib/Target/SparcV9/ModuloScheduling/Makefile
+++ b/llvm/lib/Target/SparcV9/ModuloScheduling/Makefile
@@ -9,6 +9,6 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9modulosched
+LIBRARYNAME = LLVMSparcV9ModuloSched
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/Makefile b/llvm/lib/Target/SparcV9/RegAlloc/Makefile
index 4daa1f5..c19984c 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/Makefile
+++ b/llvm/lib/Target/SparcV9/RegAlloc/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9regalloc
+LIBRARYNAME = LLVMSparcV9RegAlloc
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Target/X86/Makefile b/llvm/lib/Target/X86/Makefile
index bdaf28c..87115ea 100644
--- a/llvm/lib/Target/X86/Makefile
+++ b/llvm/lib/Target/X86/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = x86
+LIBRARYNAME = LLVMX86
 TARGET = X86
 # Make sure that tblgen is run, first thing.
 BUILT_SOURCES = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \