diff options
| author | Brian Gaeke <gaeke@uiuc.edu> | 2004-01-22 22:53:48 +0000 |
|---|---|---|
| committer | Brian Gaeke <gaeke@uiuc.edu> | 2004-01-22 22:53:48 +0000 |
| commit | ecc92bfe6e476a99f5cbfedda97ce46b9dc1857e (patch) | |
| tree | 2541b67fef8eeeef35e8d2bebbee47c6f6bc95dc | |
| parent | 3f58a875f120f16a58ee227bcddd06f7356540ae (diff) | |
| download | bcm5719-llvm-ecc92bfe6e476a99f5cbfedda97ce46b9dc1857e.tar.gz bcm5719-llvm-ecc92bfe6e476a99f5cbfedda97ce46b9dc1857e.zip | |
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.
llvm-svn: 10964
| -rw-r--r-- | llvm/Makefile.config.in | 1 | ||||
| -rw-r--r-- | llvm/Makefile.rules | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/llvm/Makefile.config.in b/llvm/Makefile.config.in index 8918e8339eb..81e2b63108a 100644 --- a/llvm/Makefile.config.in +++ b/llvm/Makefile.config.in @@ -187,6 +187,7 @@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ +bytecode_libdir = $(LLVMGCCDIR)/bytecode-libs includedir = @includedir@ infodir = @infodir@ mandir = @mandir@ diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 7da6f5737ae..bae0e9c0013 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -454,6 +454,11 @@ endif # 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,12 +487,8 @@ LIBNAME_BC := $(DESTLIBBYTECODE)/lib$(LIBRARYNAME).bc # 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 ======= cp $< $@ |
