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

[Brian Gaeke]

Changes in directory llvm:

Makefile.config.in updated: 1.18 -> 1.19
Makefile.rules updated: 1.175 -> 1.176

---
Log message:

Move bytecode_libdir def'n to Makefile.config.in from Makefile.rules, so it
lives near the other installation dirs (like libdir, bindir, etc.).

Move the rule for making bytecode_libdir out of the ifdef LIBRARYNAME...endif.


---
Diffs of the changes:  (+6 -4)

Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.18 llvm/Makefile.config.in:1.19
--- llvm/Makefile.config.in:1.18	Thu Jan 22 15:55:01 2004
+++ llvm/Makefile.config.in	Thu Jan 22 16:53:48 2004
@@ -187,6 +187,7 @@
 sharedstatedir = @sharedstatedir@ 
 localstatedir = @localstatedir@
 libdir = @libdir@
+bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs
 includedir = @includedir@
 infodir = @infodir@
 mandir = @mandir@


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.175 llvm/Makefile.rules:1.176
--- llvm/Makefile.rules:1.175	Thu Jan 22 15:54:51 2004
+++ llvm/Makefile.rules	Thu Jan 22 16:53:48 2004
@@ -454,6 +454,11 @@
 #  of it.  For this reason, sometimes it's useful to use libraries as .a files.
 ###########################################################################
 
+# Install rule for making bytecode library directory if it does not exist.
+# Trigger this by making libraries that need to be installed here depend on it.
+$(DESTDIR)$(bytecode_libdir):
+	$(MKDIR) $@
+
 ifdef LIBRARYNAME
 
 # Make sure there isn't any extranous whitespace on the LIBRARYNAME option
@@ -482,11 +487,7 @@
 # dynamic target builds a shared object version of the library...
 dynamic:: $(LIBNAME_CUR)
 bytecodelib:: $(LIBNAME_BC)
-bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs
 install-bytecode-library:: $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc
-
-$(DESTDIR)$(bytecode_libdir):
-	$(MKDIR) $@
 
 $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) $(DESTDIR)$(bytecode_libdir)
 	@${ECHO} ======= Installing $(LIBRARYNAME) bytecode library =======