Date: Tue, 18 May 2010 23:18:41 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r208280 - in projects/clangbsd-import: . lib lib/clang lib/clang/include lib/clang/libclanganalysis lib/clang/libclangast lib/clang/libclangbasic lib/clang/libclangchecker lib/clang/lib... Message-ID: <201005182318.o4INIfDT097023@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Tue May 18 23:18:41 2010 New Revision: 208280 URL: http://svn.freebsd.org/changeset/base/208280 Log: The giant renaming of Clang Makefiles. Move libraries into lib/clang and binaries into usr.bin/clang Discussed on: arch Added: projects/clangbsd-import/lib/clang/ - copied from r208276, projects/clangbsd-import/usr.bin/clang/lib/ projects/clangbsd-import/lib/clang/clang.build.mk - copied, changed from r208276, projects/clangbsd-import/usr.bin/clang/clang.build.mk projects/clangbsd-import/lib/clang/clang.lib.mk - copied, changed from r208276, projects/clangbsd-import/usr.bin/clang/clang.lib.mk projects/clangbsd-import/lib/clang/include/ - copied from r208276, projects/clangbsd-import/usr.bin/clang/include/ projects/clangbsd-import/usr.bin/clang/clang/ - copied from r208276, projects/clangbsd-import/usr.bin/clang/bin/clang/ projects/clangbsd-import/usr.bin/clang/tblgen/ - copied from r208276, projects/clangbsd-import/usr.bin/clang/bin/tblgen/ Deleted: projects/clangbsd-import/usr.bin/clang/bin/clang/ projects/clangbsd-import/usr.bin/clang/bin/tblgen/ projects/clangbsd-import/usr.bin/clang/clang.build.mk projects/clangbsd-import/usr.bin/clang/clang.lib.mk projects/clangbsd-import/usr.bin/clang/include/ projects/clangbsd-import/usr.bin/clang/lib/ Modified: projects/clangbsd-import/Makefile.inc1 projects/clangbsd-import/lib/Makefile projects/clangbsd-import/lib/clang/Makefile projects/clangbsd-import/lib/clang/libclanganalysis/Makefile projects/clangbsd-import/lib/clang/libclangast/Makefile projects/clangbsd-import/lib/clang/libclangbasic/Makefile projects/clangbsd-import/lib/clang/libclangchecker/Makefile projects/clangbsd-import/lib/clang/libclangcodegen/Makefile projects/clangbsd-import/lib/clang/libclangdriver/Makefile projects/clangbsd-import/lib/clang/libclangfrontend/Makefile projects/clangbsd-import/lib/clang/libclanglex/Makefile projects/clangbsd-import/lib/clang/libclangparse/Makefile projects/clangbsd-import/lib/clang/libclangrewrite/Makefile projects/clangbsd-import/lib/clang/libclangsema/Makefile projects/clangbsd-import/lib/clang/libllvmanalysis/Makefile projects/clangbsd-import/lib/clang/libllvmarmasmparser/Makefile projects/clangbsd-import/lib/clang/libllvmarmasmprinter/Makefile projects/clangbsd-import/lib/clang/libllvmarmcodegen/Makefile projects/clangbsd-import/lib/clang/libllvmarminfo/Makefile projects/clangbsd-import/lib/clang/libllvmasmprinter/Makefile projects/clangbsd-import/lib/clang/libllvmbitreader/Makefile projects/clangbsd-import/lib/clang/libllvmbitwriter/Makefile projects/clangbsd-import/lib/clang/libllvmcodegen/Makefile projects/clangbsd-import/lib/clang/libllvmcore/Makefile projects/clangbsd-import/lib/clang/libllvminstcombine/Makefile projects/clangbsd-import/lib/clang/libllvmipa/Makefile projects/clangbsd-import/lib/clang/libllvmipo/Makefile projects/clangbsd-import/lib/clang/libllvmmc/Makefile projects/clangbsd-import/lib/clang/libllvmmcparser/Makefile projects/clangbsd-import/lib/clang/libllvmmipsasmprinter/Makefile projects/clangbsd-import/lib/clang/libllvmmipscodegen/Makefile projects/clangbsd-import/lib/clang/libllvmmipsinfo/Makefile projects/clangbsd-import/lib/clang/libllvmpowerpcasmprinter/Makefile projects/clangbsd-import/lib/clang/libllvmpowerpccodegen/Makefile projects/clangbsd-import/lib/clang/libllvmpowerpcinfo/Makefile projects/clangbsd-import/lib/clang/libllvmscalaropts/Makefile projects/clangbsd-import/lib/clang/libllvmselectiondag/Makefile projects/clangbsd-import/lib/clang/libllvmsupport/Makefile projects/clangbsd-import/lib/clang/libllvmsystem/Makefile projects/clangbsd-import/lib/clang/libllvmtarget/Makefile projects/clangbsd-import/lib/clang/libllvmtransformutils/Makefile projects/clangbsd-import/lib/clang/libllvmx86asmparser/Makefile projects/clangbsd-import/lib/clang/libllvmx86asmprinter/Makefile projects/clangbsd-import/lib/clang/libllvmx86codegen/Makefile projects/clangbsd-import/lib/clang/libllvmx86info/Makefile projects/clangbsd-import/usr.bin/clang/Makefile projects/clangbsd-import/usr.bin/clang/clang.prog.mk projects/clangbsd-import/usr.bin/clang/clang/Makefile projects/clangbsd-import/usr.bin/clang/tblgen/Makefile Modified: projects/clangbsd-import/Makefile.inc1 ============================================================================== --- projects/clangbsd-import/Makefile.inc1 Tue May 18 22:30:55 2010 (r208279) +++ projects/clangbsd-import/Makefile.inc1 Tue May 18 23:18:41 2010 (r208280) @@ -959,9 +959,9 @@ _crunchgen= usr.sbin/crunch/crunchgen # XXX: There is no way to specify bootstrap tools depending on MK-flags # with different per-architecture default values. Always build tblgen. _clang_tblgen= \ - usr.bin/clang/lib/libllvmsupport \ - usr.bin/clang/lib/libllvmsystem \ - usr.bin/clang/bin/tblgen + lib/clang/libllvmsupport \ + lib/clang/libllvmsystem \ + usr.bin/clang/tblgen .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ Modified: projects/clangbsd-import/lib/Makefile ============================================================================== --- projects/clangbsd-import/lib/Makefile Tue May 18 22:30:55 2010 (r208279) +++ projects/clangbsd-import/lib/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -108,7 +108,8 @@ SUBDIR= ${SUBDIR_ORDERED} \ libwrap \ liby \ libz \ - ${_bind} + ${_bind} \ + ${_clang} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -137,6 +138,10 @@ _libsdp= libsdp _libbsnmp= libbsnmp .endif +.if ${MK_CLANG} != "no" +_clang= clang +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif Modified: projects/clangbsd-import/lib/clang/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR= libclanganalysis \ +SUBDIR= libclanganalysis \ libclangast \ libclangbasic \ libclangchecker \ @@ -43,6 +43,8 @@ SUBDIR= libclanganalysis \ libllvmx86asmparser \ libllvmx86asmprinter \ libllvmx86codegen \ - libllvmx86info + libllvmx86info \ + \ + include .include <bsd.subdir.mk> Copied and modified: projects/clangbsd-import/lib/clang/clang.build.mk (from r208276, projects/clangbsd-import/usr.bin/clang/clang.build.mk) ============================================================================== --- projects/clangbsd-import/usr.bin/clang/clang.build.mk Tue May 18 18:28:17 2010 (r208276, copy source) +++ projects/clangbsd-import/lib/clang/clang.build.mk Tue May 18 23:18:41 2010 (r208280) @@ -1,11 +1,10 @@ # $FreeBSD$ -LLVM_SRCS=${.CURDIR}/../../../../contrib/llvm CLANG_SRCS=${LLVM_SRCS}/tools/clang CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \ -I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \ - -I${.CURDIR}/../../include \ + -I${LLVM_SRCS}/../../lib/clang/include \ -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG Copied and modified: projects/clangbsd-import/lib/clang/clang.lib.mk (from r208276, projects/clangbsd-import/usr.bin/clang/clang.lib.mk) ============================================================================== --- projects/clangbsd-import/usr.bin/clang/clang.lib.mk Tue May 18 18:28:17 2010 (r208276, copy source) +++ projects/clangbsd-import/lib/clang/clang.lib.mk Tue May 18 23:18:41 2010 (r208280) @@ -1,5 +1,7 @@ # $FreeBSD$ +LLVM_SRCS=${.CURDIR}/../../../contrib/llvm + .include "clang.build.mk" INTERNALLIB= Modified: projects/clangbsd-import/lib/clang/libclanganalysis/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclanganalysis/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclanganalysis/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= AnalysisContext.cpp CFG.cpp LiveVa TGHDRS= DiagnosticAnalysisKinds DiagnosticCommonKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangast/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangast/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangast/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -16,4 +16,4 @@ SRCS= APValue.cpp ASTConsumer.cpp ASTCon TGHDRS= DiagnosticASTKinds DiagnosticCommonKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangbasic/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangbasic/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangbasic/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -12,4 +12,4 @@ TGHDRS= DiagnosticASTKinds DiagnosticAna DiagnosticFrontendKinds DiagnosticGroups DiagnosticLexKinds \ DiagnosticParseKinds DiagnosticSemaKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangchecker/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangchecker/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangchecker/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -35,4 +35,4 @@ SRCS= AdjustedReturnValueChecker.cpp Agg TGHDRS= DiagnosticAnalysisKinds DiagnosticCommonKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangcodegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangcodegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangcodegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -14,4 +14,4 @@ SRCS= CGBlocks.cpp CGBuiltin.cpp CGCXX.c TGHDRS= DiagnosticCommonKinds Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangdriver/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangdriver/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangdriver/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -10,4 +10,4 @@ SRCS= Action.cpp Arg.cpp ArgList.cpp CC1 TGHDRS= DiagnosticCommonKinds DiagnosticDriverKinds Options CC1Options -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangfrontend/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangfrontend/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangfrontend/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -22,4 +22,4 @@ TGHDRS= DiagnosticASTKinds DiagnosticCom DiagnosticFrontendKinds DiagnosticLexKinds DiagnosticSemaKinds \ CC1Options -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclanglex/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclanglex/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclanglex/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -12,4 +12,4 @@ SRCS= HeaderMap.cpp HeaderSearch.cpp Lex TGHDRS= DiagnosticCommonKinds DiagnosticLexKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangparse/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangparse/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangparse/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -11,4 +11,4 @@ SRCS= AttributeList.cpp DeclSpec.cpp Min TGHDRS= DiagnosticCommonKinds DiagnosticParseKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangrewrite/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangrewrite/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangrewrite/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= DeltaTree.cpp HTMLRewrite.cpp Rewr TGHDRS= DiagnosticCommonKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libclangsema/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libclangsema/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libclangsema/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -20,4 +20,4 @@ SRCS= AnalysisBasedWarnings.cpp CodeComp TGHDRS= DiagnosticASTKinds DiagnosticCommonKinds DiagnosticParseKinds \ DiagnosticSemaKinds -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmanalysis/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmanalysis/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmanalysis/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -22,4 +22,4 @@ SRCS= AliasAnalysis.cpp AliasAnalysisCou TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmarmasmparser/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmarmasmparser/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmarmasmparser/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= ARMAsmParser.cpp ARMAsmLexer.cpp TGHDRS= ARMGenRegisterInfo.h ARMGenRegisterNames ARMGenInstrNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmarmasmprinter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmarmasmprinter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmarmasmprinter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= ARMAsmPrinter.cpp ARMInstPrinter.c TGHDRS= ARMGenAsmWriter ARMGenInstrNames ARMGenRegisterInfo.h \ ARMGenRegisterNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmarmcodegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmarmcodegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmarmcodegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -20,4 +20,4 @@ TGHDRS= ARMGenCallingConv ARMGenCodeEmit ARMGenRegisterInfo ARMGenRegisterNames ARMGenSubtarget \ Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmarminfo/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmarminfo/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmarminfo/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= ARMTargetInfo.cpp TGHDRS= ARMGenRegisterNames ARMGenInstrNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmasmprinter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmasmprinter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmasmprinter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -6,4 +6,4 @@ SRCDIR= lib/CodeGen/AsmPrinter SRCS= AsmPrinter.cpp AsmPrinterDwarf.cpp AsmPrinterInlineAsm.cpp \ DIE.cpp DwarfDebug.cpp DwarfException.cpp OcamlGCPrinter.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmbitreader/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmbitreader/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmbitreader/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -7,4 +7,4 @@ SRCS= BitReader.cpp BitcodeReader.cpp TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmbitwriter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmbitwriter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmbitwriter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -6,4 +6,4 @@ SRCDIR= lib/Bitcode/Writer SRCS= BitWriter.cpp BitcodeWriter.cpp BitcodeWriterPass.cpp \ ValueEnumerator.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmcodegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmcodegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmcodegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -37,4 +37,4 @@ SRCS= AggressiveAntiDepBreaker.cpp Analy TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmcore/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmcore/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmcore/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -15,4 +15,4 @@ SRCS= AsmWriter.cpp Attributes.cpp AutoU TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvminstcombine/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvminstcombine/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvminstcombine/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -13,4 +13,4 @@ SRCS= InstCombineAddSub.cpp InstCombineA TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmipa/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmipa/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmipa/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= CallGraph.cpp CallGraphSCCPass.cpp TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmipo/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmipo/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmipo/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -14,4 +14,4 @@ SRCS= ArgumentPromotion.cpp ConstantMerg TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmmc/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmmc/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmmc/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -11,4 +11,4 @@ SRCS= MCAsmInfo.cpp MCAsmInfoCOFF.cpp MC MCSectionMachO.cpp MCStreamer.cpp MCSymbol.cpp MCValue.cpp \ MachObjectWriter.cpp TargetAsmBackend.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmmcparser/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmmcparser/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmmcparser/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -6,4 +6,4 @@ SRCDIR= lib/MC/MCParser SRCS= AsmLexer.cpp AsmParser.cpp MCAsmLexer.cpp MCAsmParser.cpp \ TargetAsmParser.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmmipsasmprinter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmmipsasmprinter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmmipsasmprinter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= MipsAsmPrinter.cpp TGHDRS= MipsGenAsmWriter MipsGenInstrNames MipsGenRegisterInfo.h \ MipsGenRegisterNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmmipscodegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmmipscodegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmmipscodegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -12,4 +12,4 @@ TGHDRS= Intrinsics MipsGenAsmWriter Mips MipsGenInstrInfo MipsGenInstrNames MipsGenRegisterInfo.h \ MipsGenRegisterInfo MipsGenRegisterNames MipsGenSubtarget -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmmipsinfo/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmmipsinfo/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmmipsinfo/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= MipsTargetInfo.cpp TGHDRS= MipsGenRegisterNames MipsGenInstrNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmpowerpcasmprinter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmpowerpcasmprinter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmpowerpcasmprinter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= PPCAsmPrinter.cpp TGHDRS= PPCGenAsmWriter PPCGenInstrNames PPCGenRegisterInfo.h \ PPCGenRegisterNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmpowerpccodegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmpowerpccodegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmpowerpccodegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -13,4 +13,4 @@ TGHDRS= Intrinsics PPCGenCallingConv PPC PPCGenInstrInfo PPCGenInstrNames PPCGenRegisterInfo.h \ PPCGenRegisterInfo PPCGenRegisterNames PPCGenSubtarget -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmpowerpcinfo/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmpowerpcinfo/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmpowerpcinfo/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= PowerPCTargetInfo.cpp TGHDRS= PPCGenRegisterNames PPCGenInstrNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmscalaropts/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmscalaropts/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmscalaropts/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -15,4 +15,4 @@ SRCS= ADCE.cpp BasicBlockPlacement.cpp C TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmselectiondag/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmselectiondag/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmselectiondag/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -14,4 +14,4 @@ SRCS= CallingConvLower.cpp DAGCombiner.c TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmsupport/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmsupport/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmsupport/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -16,4 +16,4 @@ SRCS= APFloat.cpp APInt.cpp APSInt.cpp A circular_raw_ostream.cpp raw_os_ostream.cpp raw_ostream.cpp \ regcomp.c regerror.c regexec.c regfree.c regstrlcpy.c -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmsystem/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmsystem/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmsystem/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= Alarm.cpp Atomic.cpp Disassembler. SearchForAddressOfSpecialSymbol.cpp Signals.cpp \ ThreadLocal.cpp Threading.cpp TimeValue.cpp Valgrind.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmtarget/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmtarget/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmtarget/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -9,4 +9,4 @@ SRCS= Mangler.cpp SubtargetFeature.cpp T TargetLoweringObjectFile.cpp TargetMachine.cpp \ TargetRegisterInfo.cpp TargetSubtarget.cpp -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmtransformutils/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmtransformutils/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmtransformutils/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -14,4 +14,4 @@ SRCS= AddrModeMatcher.cpp BasicBlockUtil TGHDRS= Intrinsics -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmx86asmparser/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmx86asmparser/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmx86asmparser/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= X86AsmParser.cpp X86AsmLexer.cpp TGHDRS= X86GenRegisterNames X86GenInstrNames X86GenAsmMatcher -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmx86asmprinter/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmx86asmprinter/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmx86asmprinter/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -10,4 +10,4 @@ SRCS= X86ATTInstPrinter.cpp X86AsmPrinte TGHDRS= X86GenAsmWriter1 X86GenAsmWriter X86GenInstrInfo \ X86GenInstrNames X86GenRegisterInfo.h X86GenRegisterNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmx86codegen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmx86codegen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmx86codegen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -16,4 +16,4 @@ TGHDRS= Intrinsics X86GenCallingConv X86 X86GenInstrInfo X86GenInstrNames X86GenRegisterInfo.h \ X86GenRegisterInfo X86GenRegisterNames X86GenSubtarget -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/lib/clang/libllvmx86info/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/lib/libllvmx86info/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/lib/clang/libllvmx86info/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -8,4 +8,4 @@ SRCS= X86TargetInfo.cpp TGHDRS= X86GenRegisterNames X86GenInstrNames -.include "../../clang.lib.mk" +.include "../clang.lib.mk" Modified: projects/clangbsd-import/usr.bin/clang/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/Makefile Tue May 18 22:30:55 2010 (r208279) +++ projects/clangbsd-import/usr.bin/clang/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -1,7 +1,5 @@ # $FreeBSD$ -SUBDIR= lib \ - bin \ - include +SUBDIR= clang .include <bsd.subdir.mk> Modified: projects/clangbsd-import/usr.bin/clang/clang.prog.mk ============================================================================== --- projects/clangbsd-import/usr.bin/clang/clang.prog.mk Tue May 18 22:30:55 2010 (r208279) +++ projects/clangbsd-import/usr.bin/clang/clang.prog.mk Tue May 18 23:18:41 2010 (r208280) @@ -1,10 +1,12 @@ # $FreeBSD$ -.include "clang.build.mk" +LLVM_SRCS=${.CURDIR}/../../../contrib/llvm + +.include "../../lib/clang/clang.build.mk" .for lib in ${LIBDEPS} -DPADD+= ${.OBJDIR}/../../lib/lib${lib}/lib${lib}.a -LDADD+= ${.OBJDIR}/../../lib/lib${lib}/lib${lib}.a +DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a +LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor BINDIR?=/usr/bin Modified: projects/clangbsd-import/usr.bin/clang/clang/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/bin/clang/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/usr.bin/clang/clang/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -25,4 +25,4 @@ LIBDEPS=clangfrontend clangdriver clangc llvmtransformutils llvmmc llvmmcparser llvmipa llvmanalysis \ llvmtarget llvmmc llvmcore llvmarminfo llvmsupport llvmsystem -.include "../../clang.prog.mk" +.include "../clang.prog.mk" Modified: projects/clangbsd-import/usr.bin/clang/tblgen/Makefile ============================================================================== --- projects/clangbsd-import/usr.bin/clang/bin/tblgen/Makefile Tue May 18 18:28:17 2010 (r208276) +++ projects/clangbsd-import/usr.bin/clang/tblgen/Makefile Tue May 18 23:18:41 2010 (r208280) @@ -20,4 +20,4 @@ MAN= LIBDEPS=llvmsupport llvmsystem -.include "../../clang.prog.mk" +.include "../clang.prog.mk"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005182318.o4INIfDT097023>