[llvm-commits] [parallel] CVS: llvm/Makefile.config.in Makefile.rules

[Misha Brukman]

Changes in directory llvm:

Makefile.config.in updated: 1.16.2.1 -> 1.16.2.2
Makefile.rules updated: 1.169.2.1 -> 1.169.2.2

---
Log message:

Merge from trunk.

---
Diffs of the changes:  (+17 -5)

Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.16.2.1 llvm/Makefile.config.in:1.16.2.2
--- llvm/Makefile.config.in:1.16.2.1	Mon Mar  1 17:54:05 2004
+++ llvm/Makefile.config.in	Wed Mar 10 19:07:33 2004
@@ -65,8 +65,8 @@
 # object files.
 OBJ_ROOT := .
 
-# Path to location for LLVM front-end this should only be specified here if you
-# want to override the value set in Makefile.$(uname)
+# Path to location for LLVM C/C++ front-end. You can modify this if you
+# want to override the value set by configure.
 LLVMGCCDIR := @LLVMGCCDIR@
 
 # When this variable is set to 1, programs in the llvm/test/Programs hierarchy


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.169.2.1 llvm/Makefile.rules:1.169.2.2
--- llvm/Makefile.rules:1.169.2.1	Mon Mar  1 17:54:05 2004
+++ llvm/Makefile.rules	Wed Mar 10 19:07:33 2004
@@ -78,6 +78,7 @@
 # if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
 all:: bytecodelib
 install:: install-bytecode-library
+install-bytecode:: install-bytecode-library
 endif
 
 # Default Rule:  Make sure it's also a :: rule
@@ -92,6 +93,9 @@
 # Default rule for building only bytecode.
 bytecode::
 
+# Default rule for installing only bytecode.
+install-bytecode::
+
 # Print out the directories used for building
 prdirs::
 	@${ECHO} "Build Source Root: " $(BUILD_SRC_ROOT)
@@ -320,6 +324,13 @@
 #	(Note that we always link with the C++ compiler).
 #
 Link     := $(LIBTOOL) --mode=link $(CXX)
+ifeq ($(ARCH),Sparc)
+Link += -B /home/vadve/shared/localtools/sparc/bin
+else 
+  ifeq ($(ARCH),X86)
+  Link += -B /home/vadve/shared/localtools/x86/bin
+  endif
+endif
 
 # link both projlib and llvmlib libraries
 LinkG    := $(Link) -g -L$(PROJLIBDEBUGSOURCE)  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
@@ -391,7 +402,7 @@
 #---------------------------------------------------------
 
 ifdef DIRS
-all install clean test bytecode stripped-bytecode::
+all install clean test bytecode stripped-bytecode install-bytecode::
 	$(VERB) for dir in ${DIRS}; do \
 		if [ ! -f $$dir/Makefile ]; \
 		then \
@@ -410,8 +421,9 @@
 test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 stripped-bytecode :: $(addsuffix /.makestripped-bytecode, $(PARALLEL_DIRS))
+install-bytecode :: $(addsuffix /.makeinstall-bytecode, $(PARALLEL_DIRS))
 
-%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode %/.makestripped-bytecode:
+%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode %/.makestripped-bytecode %/.makeinstall-bytecode:
 	$(VERB) if [ ! -f $(@D)/Makefile ]; \
 	then \
 		$(MKDIR) $(@D); \
@@ -422,7 +434,7 @@
 
 # Handle directories that may or may not exist
 ifdef OPTIONAL_DIRS
-all install clean test bytecode stripped-bytecode::
+all install clean test bytecode stripped-bytecode install-bytecode::
 	$(VERB) for dir in ${OPTIONAL_DIRS}; do \
 		if [ -d $(SourceDir)/$$dir ]; \
 		then\