5 files changed, 16 insertions, 45 deletions
diff --git a/llvm/tools/llvmc/plugins/Base/Makefile b/llvm/tools/llvmc/plugins/Base/Makefile
index 5ca6048508a..eb6ed010c6f 100644
--- a/llvm/tools/llvmc/plugins/Base/Makefile
+++ b/llvm/tools/llvmc/plugins/Base/Makefile
@@ -7,7 +7,9 @@
 #
 ##===----------------------------------------------------------------------===##
 
+LEVEL = ../..
+
 LLVMC_PLUGIN = Base
 BUILT_SOURCES = AutoGenerated.inc
 
-include ../Makefile
+include $(LEVEL)/Makefile.llvmc
diff --git a/llvm/tools/llvmc/plugins/Clang/Makefile b/llvm/tools/llvmc/plugins/Clang/Makefile
index 32060138c23..a1b011e90db 100644
--- a/llvm/tools/llvmc/plugins/Clang/Makefile
+++ b/llvm/tools/llvmc/plugins/Clang/Makefile
@@ -7,7 +7,9 @@
 #
 ##===----------------------------------------------------------------------===##
 
+LEVEL = ../..
+
 LLVMC_PLUGIN = Clang
 BUILT_SOURCES = AutoGenerated.inc
 
-include ../Makefile
+include $(LEVEL)/Makefile.llvmc
diff --git a/llvm/tools/llvmc/plugins/Hello/Makefile b/llvm/tools/llvmc/plugins/Hello/Makefile
index 181dd0c6050..8e9fa6f3135 100644
--- a/llvm/tools/llvmc/plugins/Hello/Makefile
+++ b/llvm/tools/llvmc/plugins/Hello/Makefile
@@ -7,6 +7,8 @@
 #
 ##===----------------------------------------------------------------------===##
 
+LEVEL = ../..
+
 LLVMC_PLUGIN = Hello
 
-include ../Makefile
+include $(LEVEL)/Makefile.llvmc
diff --git a/llvm/tools/llvmc/plugins/Makefile b/llvm/tools/llvmc/plugins/Makefile
index 734323f50d7..37dac6f0ac0 100644
--- a/llvm/tools/llvmc/plugins/Makefile
+++ b/llvm/tools/llvmc/plugins/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc/plugins/Makefile.plugins ----------------*- Makefile -*-===##
+##===- tools/llvmc/plugins/Makefile ------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,49 +7,12 @@
 #
 ##===----------------------------------------------------------------------===##
 
-ifndef LLVMC_PLUGIN
-
 LEVEL = ../../..
-DIRS = $(BUILTIN_PLUGINS)
-
-# TOFIX: Should we also build DSO versions of plugins?
-export BUILTIN_LLVMC_PLUGIN=1
-
-include $(LEVEL)/Makefile.common
 
-else # LLVMC_PLUGIN
-
-LEVEL = ../../../..
-
-LIBRARYNAME := $(patsubst %,plugin_llvmc_%,$(LLVMC_PLUGIN))
-REQUIRES_EH = 1
-
-ifndef BUILTIN_LLVMC_PLUGIN
-LOADABLE_MODULE = 1
+ifneq ($(LLVMC_BUILTIN_PLUGINS),)
+DIRS = $(LLVMC_BUILTIN_PLUGINS)
 endif
 
-ifneq ($(BUILT_SOURCES),)
-BUILD_AUTOGENERATED_INC=1
-endif
+export LLVMC_BUILTIN_PLUGIN=1
 
 include $(LEVEL)/Makefile.common
-
-# TOFIX: This probably should go into Makefile.rules
-
-ifdef BUILD_AUTOGENERATED_INC
-
-TOOLS_SOURCE := $(strip $(wildcard $(PROJ_SRC_DIR)/*.td))
-
-TD_COMMON :=$(strip $(wildcard \
-		$(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td))
-
-$(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir \
-				$(TBLGEN) $(TD_COMMON)
-	$(Echo) "Building LLVMC configuration library with tblgen"
-	$(Verb) $(TableGen) -gen-llvmc -o $(call SYSPATH, $@) $<
-
-AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp
-	$(Verb) $(CMP) -s $@ $< || $(CP) $< $@
-endif # BUILD_AUTOGENERATED_INC
-
-endif # LLVMC_PLUGIN
diff --git a/llvm/tools/llvmc/plugins/Simple/Makefile b/llvm/tools/llvmc/plugins/Simple/Makefile
index 1cd5af7a15e..c38cda51719 100644
--- a/llvm/tools/llvmc/plugins/Simple/Makefile
+++ b/llvm/tools/llvmc/plugins/Simple/Makefile
@@ -7,7 +7,9 @@
 #
 ##===----------------------------------------------------------------------===##
 
+LEVEL = ../..
+
 LLVMC_PLUGIN = Simple
 BUILT_SOURCES = AutoGenerated.inc
 
-include ../Makefile
+include $(LEVEL)/Makefile.llvmc