Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.6 -> 1.7
---
Log message:
Build llvm-config into the ToolDir not in the local directory. This makes
it more likely to be in a developer's path and consistent with all the
other tools.
---
Diffs of the changes: (+6 -6)
Makefile | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.6 llvm/tools/llvm-config/Makefile:1.7
--- llvm/tools/llvm-config/Makefile:1.6 Wed May 3 12:49:50 2006
+++ llvm/tools/llvm-config/Makefile Wed May 31 20:52:49 2006
@@ -49,7 +49,7 @@
$(ConfigStatusScript) tools/llvm-config/llvm-config.in
# Build our final script.
-llvm-config: llvm-config.in $(FinalLibDeps)
+$(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
$(Echo) "Building llvm-config script."
$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
@@ -61,19 +61,19 @@
else
# We don't have perl, just generate a dummy llvm-config
-llvm-config:
+$(ToolDir)/llvm-config:
$(Echo) "Building place holder llvm-config script."
$(Verb) $(ECHO) 'echo llvm-config: Perl not found so llvm-config could
not be generated' >> $@
$(Verb) chmod +x $@
endif
# Hook into the standard Makefile rules.
-all-local:: llvm-config
+all-local:: $(ToolDir)/llvm-config
clean-local::
- $(Verb) $(RM) -f llvm-config llvm-config.in $(FinalLibDeps) $(LibDeps) \
- GenLibDeps.out
+ $(Verb) $(RM) -f $(ToolDir)/llvm-config llvm-config.in $(FinalLibDeps) \
+ $(LibDeps) GenLibDeps.out
install-local:: all-local
$(Echo) Installing llvm-config
$(Verb) $(MKDIR) $(PROJ_bindir)
- $(Verb) $(ScriptInstall) llvm-config $(PROJ_bindir)
+ $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
