13 files changed, 49 insertions, 55 deletions
diff --git a/llvm/runtime/GCCLibraries/Makefile b/llvm/runtime/GCCLibraries/Makefile
index 90826aa0a39..e770428fbd2 100644
--- a/llvm/runtime/GCCLibraries/Makefile
+++ b/llvm/runtime/GCCLibraries/Makefile
@@ -7,13 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL = ../..
+LEVEL := ../..
 PARALLEL_DIRS := crtend libc libcurses libg libgcc libgdbm libm libmalloc \
                  libtermcap libucb libutempter libutil
 include $(LEVEL)/Makefile.common
-
-# Install target for libraries: copy bytecode files to $LLVMGCCDIR/bytecode-libs
-#
-install::
-
-clean::
diff --git a/llvm/runtime/GCCLibraries/crtend/Makefile b/llvm/runtime/GCCLibraries/crtend/Makefile
index 0d42fa242d5..4c71d50a9ee 100644
--- a/llvm/runtime/GCCLibraries/crtend/Makefile
+++ b/llvm/runtime/GCCLibraries/crtend/Makefile
@@ -15,17 +15,17 @@
 #
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-DONT_BUILD_RELINKED=1
-BYTECODE_LIBRARY=1
-LIBRARYNAME=crtend
+LEVEL = ../../..
+DONT_BUILD_RELINKED = 1
+BYTECODE_LIBRARY = 1
+LIBRARYNAME = crtend
 
 # Note: We're fooling Makefile.rules here. The sources listed don't exist but
 # it doesn't matter. Makefile.rules just uses $(SOURCES) to generate the set of
 # object files to put in the library. Since we've specified BYTECODE_LIBRARY
 # above, it changes the .c suffix to .bc suffix. Below are rules to build 
 # each of those bytecode objects from the sources we do have in this directory.
-SOURCES=comp_main.c comp_genericeh.c comp_sjljeh.c
+SOURCES = comp_main.c comp_genericeh.c comp_sjljeh.c
 
 EXTRA_DIST   := comp_main.lst comp_genericeh.lst comp_sjljeh.lst
 
diff --git a/llvm/runtime/GCCLibraries/libc/Makefile b/llvm/runtime/GCCLibraries/libc/Makefile
index 297d420908d..4df154eb6fb 100644
--- a/llvm/runtime/GCCLibraries/libc/Makefile
+++ b/llvm/runtime/GCCLibraries/libc/Makefile
@@ -8,9 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=c
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = c
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/runtime/GCCLibraries/libcurses/Makefile b/llvm/runtime/GCCLibraries/libcurses/Makefile
index 09807c4a708..fd9c98856fb 100644
--- a/llvm/runtime/GCCLibraries/libcurses/Makefile
+++ b/llvm/runtime/GCCLibraries/libcurses/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=curses
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = curses
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libgcc/Makefile b/llvm/runtime/GCCLibraries/libgcc/Makefile
index 4a7c58203b1..f56b0587034 100644
--- a/llvm/runtime/GCCLibraries/libgcc/Makefile
+++ b/llvm/runtime/GCCLibraries/libgcc/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=gcc
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = gcc
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libgdbm/Makefile b/llvm/runtime/GCCLibraries/libgdbm/Makefile
index 67a931d9fae..ddcbdb98f08 100644
--- a/llvm/runtime/GCCLibraries/libgdbm/Makefile
+++ b/llvm/runtime/GCCLibraries/libgdbm/Makefile
@@ -7,10 +7,10 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=gdbm
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = gdbm
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/runtime/GCCLibraries/libm/Makefile b/llvm/runtime/GCCLibraries/libm/Makefile
index 2305db49649..02807e98246 100644
--- a/llvm/runtime/GCCLibraries/libm/Makefile
+++ b/llvm/runtime/GCCLibraries/libm/Makefile
@@ -7,10 +7,10 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=m
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = m
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/runtime/GCCLibraries/libmalloc/Makefile b/llvm/runtime/GCCLibraries/libmalloc/Makefile
index 4a06f390f38..c2cfb84dc59 100644
--- a/llvm/runtime/GCCLibraries/libmalloc/Makefile
+++ b/llvm/runtime/GCCLibraries/libmalloc/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=malloc
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = malloc
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libpthread/Makefile b/llvm/runtime/GCCLibraries/libpthread/Makefile
index 3371da668f4..69979028b17 100644
--- a/llvm/runtime/GCCLibraries/libpthread/Makefile
+++ b/llvm/runtime/GCCLibraries/libpthread/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=pthread
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = pthread
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libtermcap/Makefile b/llvm/runtime/GCCLibraries/libtermcap/Makefile
index bf696b62c51..b834052243a 100644
--- a/llvm/runtime/GCCLibraries/libtermcap/Makefile
+++ b/llvm/runtime/GCCLibraries/libtermcap/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=termcap
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = termcap
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libucb/Makefile b/llvm/runtime/GCCLibraries/libucb/Makefile
index 2686bd75341..685944ebac4 100644
--- a/llvm/runtime/GCCLibraries/libucb/Makefile
+++ b/llvm/runtime/GCCLibraries/libucb/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=ucb
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = ucb
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libutempter/Makefile b/llvm/runtime/GCCLibraries/libutempter/Makefile
index b1a733d0b1f..f804a25b982 100644
--- a/llvm/runtime/GCCLibraries/libutempter/Makefile
+++ b/llvm/runtime/GCCLibraries/libutempter/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=utempter
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = utempter
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/runtime/GCCLibraries/libutil/Makefile b/llvm/runtime/GCCLibraries/libutil/Makefile
index e4baf8aeb8f..16d7549237f 100644
--- a/llvm/runtime/GCCLibraries/libutil/Makefile
+++ b/llvm/runtime/GCCLibraries/libutil/Makefile
@@ -7,9 +7,9 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL=../../..
-BYTECODE_LIBRARY=1
-DONT_BUILD_RELINKED=1
-LIBRARYNAME=util
+LEVEL = ../../..
+BYTECODE_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
+LIBRARYNAME = util
 
 include $(LEVEL)/Makefile.common