svn commit: r304889 - in projects/clang390-import: lib/clang lib/clang/liblldb usr.bin/clang usr.bin/clang/lldb

[Dimitry Andric]

Author: dim
Date: Sat Aug 27 10:00:33 2016
New Revision: 304889
URL: https://svnweb.freebsd.org/changeset/base/304889

Log:
  Centralize where LLVM_SRCS, CLANG_SRCS and LLDB_SRCS are defined.

Added:
  projects/clang390-import/lib/clang/lldb.pre.mk   (contents, props changed)
Modified:
  projects/clang390-import/lib/clang/liblldb/Makefile
  projects/clang390-import/usr.bin/clang/clang.prog.mk
  projects/clang390-import/usr.bin/clang/lldb/Makefile
  projects/clang390-import/usr.bin/clang/llvm.prog.mk

Modified: projects/clang390-import/lib/clang/liblldb/Makefile
==============================================================================
--- projects/clang390-import/lib/clang/liblldb/Makefile	Sat Aug 27 09:58:06 2016	(r304888)
+++ projects/clang390-import/lib/clang/liblldb/Makefile	Sat Aug 27 10:00:33 2016	(r304889)
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+.include "../lldb.pre.mk"
 
 LIB=		lldb
 SRCDIR=		tools/lldb/source

Added: projects/clang390-import/lib/clang/lldb.pre.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang390-import/lib/clang/lldb.pre.mk	Sat Aug 27 10:00:33 2016	(r304889)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.include "clang.pre.mk"
+
+LLDB_SRCS=	${LLVM_SRCS}/tools/lldb

Modified: projects/clang390-import/usr.bin/clang/clang.prog.mk
==============================================================================
--- projects/clang390-import/usr.bin/clang/clang.prog.mk	Sat Aug 27 09:58:06 2016	(r304888)
+++ projects/clang390-import/usr.bin/clang/clang.prog.mk	Sat Aug 27 10:00:33 2016	(r304889)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
+.include "${SRCTOP}/lib/clang/clang.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm

Modified: projects/clang390-import/usr.bin/clang/lldb/Makefile
==============================================================================
--- projects/clang390-import/usr.bin/clang/lldb/Makefile	Sat Aug 27 09:58:06 2016	(r304888)
+++ projects/clang390-import/usr.bin/clang/lldb/Makefile	Sat Aug 27 10:00:33 2016	(r304889)
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+.include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
 PROG_CXX=	lldb
 # Man page directory

Modified: projects/clang390-import/usr.bin/clang/llvm.prog.mk
==============================================================================
--- projects/clang390-import/usr.bin/clang/llvm.prog.mk	Sat Aug 27 09:58:06 2016	(r304888)
+++ projects/clang390-import/usr.bin/clang/llvm.prog.mk	Sat Aug 27 10:00:33 2016	(r304889)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
+.include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm