diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.am | 2 | ||||
-rw-r--r-- | tools/analyze/Makefile.am | 5 | ||||
-rw-r--r-- | tools/bugpoint/Makefile.am | 10 | ||||
-rw-r--r-- | tools/extract/Makefile.am | 2 | ||||
-rw-r--r-- | tools/gccas/Makefile.am | 2 | ||||
-rw-r--r-- | tools/gccld/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llc/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llee/Makefile.am | 6 | ||||
-rw-r--r-- | tools/lli/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-ar/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-as/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-bcanalyzer/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-db/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-dis/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-ld/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-link/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-nm/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-prof/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvm-stub/Makefile.am | 2 | ||||
-rw-r--r-- | tools/llvmc/Makefile.am | 2 | ||||
-rw-r--r-- | tools/opt/Makefile.am | 2 |
21 files changed, 28 insertions, 29 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index a859c26e21..64c50f44b9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config SUBDIRS = analyze llvmc bugpoint extract gccas gccld llvm-bcanalyzer llc \ llee lli llvm-ar llvm-as llvm-db llvm-dis llvm-link llvm-nm \ diff --git a/tools/analyze/Makefile.am b/tools/analyze/Makefile.am index 7bad54c001..b54c7b3cf7 100644 --- a/tools/analyze/Makefile.am +++ b/tools/analyze/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = analyze @@ -16,9 +16,6 @@ analyze_SOURCES = \ analyze.cpp \ GraphPrinters.cpp -#USEDLIBS = asmparser bcreader analysis ipa datastructure scalaropts.a transforms.a \ -# target.a scalaropts.a transformutils.a vmcore support LLVMsystem.a - analyze_LDADD = \ $(call GETOBJS,AsmParser,BCReader,Core) \ $(call GETLIBS,Analysis,IPA,DataStructure,ScalarOpts,Transforms,Target) \ diff --git a/tools/bugpoint/Makefile.am b/tools/bugpoint/Makefile.am index 312d4917d4..600f854513 100644 --- a/tools/bugpoint/Makefile.am +++ b/tools/bugpoint/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = bugpoint @@ -22,6 +22,8 @@ bugpoint_SOURCES = \ TestPasses.cpp bugpoint_LDADD = \ - $(call GETOBJS,AsmParser,BCReader,BCWriter,Core,ProfilePaths) \ - $(call GETLIBS,IPO,ScalarOpts,Analysis,Transforms,Instrument) \ - $(call GETLIBS,DataStructure,IPA,Target,TransformUtils,Support,System) + $(call GETOBJS,IPO,ScalarOpts,Analysis,Transforms,Instrument,ProfilePaths) \ + $(call GETOBJS,DataStructure,IPA) \ + $(call GETLIBS,Target) \ + $(call GETOBJS,TransformUtils,AsmParser,BCReader,BCWriter,Core) \ + $(call GETLIBS,Support,System) diff --git a/tools/extract/Makefile.am b/tools/extract/Makefile.am index 56977c15b7..9af226a800 100644 --- a/tools/extract/Makefile.am +++ b/tools/extract/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = extract diff --git a/tools/gccas/Makefile.am b/tools/gccas/Makefile.am index b6b6d0b834..64ac578a01 100644 --- a/tools/gccas/Makefile.am +++ b/tools/gccas/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = gccas diff --git a/tools/gccld/Makefile.am b/tools/gccld/Makefile.am index e88b9abfed..0f98ab1318 100644 --- a/tools/gccld/Makefile.am +++ b/tools/gccld/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = gccld diff --git a/tools/llc/Makefile.am b/tools/llc/Makefile.am index 2513cad482..6aacba6d10 100644 --- a/tools/llc/Makefile.am +++ b/tools/llc/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llc diff --git a/tools/llee/Makefile.am b/tools/llee/Makefile.am index 36700ff50d..d085c87c36 100644 --- a/tools/llee/Makefile.am +++ b/tools/llee/Makefile.am @@ -7,11 +7,11 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config -lib_LIBRARIES = libexecve.a +lib_LTLIBRARIES = libexecve.la -libexecve_a_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c +libexecve_la_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c all: llee diff --git a/tools/lli/Makefile.am b/tools/lli/Makefile.am index 9fa36eeb7c..e310951f3d 100644 --- a/tools/lli/Makefile.am +++ b/tools/lli/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = lli diff --git a/tools/llvm-ar/Makefile.am b/tools/llvm-ar/Makefile.am index abc639911c..1bc5844e73 100644 --- a/tools/llvm-ar/Makefile.am +++ b/tools/llvm-ar/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-ar diff --git a/tools/llvm-as/Makefile.am b/tools/llvm-as/Makefile.am index 52831f4499..31a8487159 100644 --- a/tools/llvm-as/Makefile.am +++ b/tools/llvm-as/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-as diff --git a/tools/llvm-bcanalyzer/Makefile.am b/tools/llvm-bcanalyzer/Makefile.am index a898f7eefa..cb83e9c693 100644 --- a/tools/llvm-bcanalyzer/Makefile.am +++ b/tools/llvm-bcanalyzer/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-bcanalyzer diff --git a/tools/llvm-db/Makefile.am b/tools/llvm-db/Makefile.am index a7a5ed8162..42d7d418de 100644 --- a/tools/llvm-db/Makefile.am +++ b/tools/llvm-db/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-db diff --git a/tools/llvm-dis/Makefile.am b/tools/llvm-dis/Makefile.am index e379c1c86a..de606dd06c 100644 --- a/tools/llvm-dis/Makefile.am +++ b/tools/llvm-dis/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-dis diff --git a/tools/llvm-ld/Makefile.am b/tools/llvm-ld/Makefile.am index 678c064733..c6aa9931c9 100644 --- a/tools/llvm-ld/Makefile.am +++ b/tools/llvm-ld/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-ld diff --git a/tools/llvm-link/Makefile.am b/tools/llvm-link/Makefile.am index 575ff28a20..cc285a9a94 100644 --- a/tools/llvm-link/Makefile.am +++ b/tools/llvm-link/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-link diff --git a/tools/llvm-nm/Makefile.am b/tools/llvm-nm/Makefile.am index 57f7650314..d04c760764 100644 --- a/tools/llvm-nm/Makefile.am +++ b/tools/llvm-nm/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-nm diff --git a/tools/llvm-prof/Makefile.am b/tools/llvm-prof/Makefile.am index 1e942d37bd..2465361ec9 100644 --- a/tools/llvm-prof/Makefile.am +++ b/tools/llvm-prof/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-prof diff --git a/tools/llvm-stub/Makefile.am b/tools/llvm-stub/Makefile.am index e4c867d014..aa5119cc6c 100644 --- a/tools/llvm-stub/Makefile.am +++ b/tools/llvm-stub/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvm-stub diff --git a/tools/llvmc/Makefile.am b/tools/llvmc/Makefile.am index ac1b398fff..125e041aea 100644 --- a/tools/llvmc/Makefile.am +++ b/tools/llvmc/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = llvmc diff --git a/tools/opt/Makefile.am b/tools/opt/Makefile.am index 14cbaade0e..9c37905ded 100644 --- a/tools/opt/Makefile.am +++ b/tools/opt/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = opt |