[llvm-commits] [llvm] r56999 - in /llvm/trunk/tools/llvmc2: Makefile plugins/Base/Makefile plugins/Clang/Makefile plugins/Hello/Makefile plugins/Makefile plugins/Makefile.plugins

[Mikhail Glushenkov]

Author: foldr
Date: Fri Oct  3 05:26:37 2008
New Revision: 56999

URL: http://llvm.org/viewvc/llvm-project?rev=56999&view=rev
Log:
Fix build breakage when objdir!=srcdir (proper fix).

Added:
    llvm/trunk/tools/llvmc2/plugins/Makefile
      - copied, changed from r56998, llvm/trunk/tools/llvmc2/plugins/Makefile.plugins
Removed:
    llvm/trunk/tools/llvmc2/plugins/Makefile.plugins
Modified:
    llvm/trunk/tools/llvmc2/Makefile
    llvm/trunk/tools/llvmc2/plugins/Base/Makefile
    llvm/trunk/tools/llvmc2/plugins/Clang/Makefile
    llvm/trunk/tools/llvmc2/plugins/Hello/Makefile

Modified: llvm/trunk/tools/llvmc2/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Makefile?rev=56999&r1=56998&r2=56999&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/Makefile (original)
+++ llvm/trunk/tools/llvmc2/Makefile Fri Oct  3 05:26:37 2008
@@ -11,10 +11,9 @@
 
 BUILTIN_PLUGINS = Base
 DRIVER_NAME = llvmc2
-DIRS = $(patsubst %,plugins/%,$(BUILTIN_PLUGINS)) src
+DIRS = plugins src
 
 export BUILTIN_PLUGINS
 export DRIVER_NAME
-export BUILTIN_LLVMC_PLUGIN=1
 
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/tools/llvmc2/plugins/Base/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Base/Makefile?rev=56999&r1=56998&r2=56999&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Base/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Base/Makefile Fri Oct  3 05:26:37 2008
@@ -9,4 +9,4 @@
 
 LLVMC_PLUGIN = Base
 
-include ../Makefile.plugins
+include ../Makefile

Modified: llvm/trunk/tools/llvmc2/plugins/Clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Clang/Makefile?rev=56999&r1=56998&r2=56999&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Clang/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Clang/Makefile Fri Oct  3 05:26:37 2008
@@ -9,5 +9,5 @@
 
 LLVMC_PLUGIN = Clang
 
-include ../Makefile.plugins
+include ../Makefile
 

Modified: llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Makefile?rev=56999&r1=56998&r2=56999&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Makefile Fri Oct  3 05:26:37 2008
@@ -9,4 +9,4 @@
 
 LLVMC_PLUGIN = Hello
 
-include ../Makefile.plugins
+include ../Makefile

Copied: llvm/trunk/tools/llvmc2/plugins/Makefile (from r56998, llvm/trunk/tools/llvmc2/plugins/Makefile.plugins)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Makefile?p2=llvm/trunk/tools/llvmc2/plugins/Makefile&p1=llvm/trunk/tools/llvmc2/plugins/Makefile.plugins&r1=56998&r2=56999&rev=56999&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Makefile.plugins (original)
+++ llvm/trunk/tools/llvmc2/plugins/Makefile Fri Oct  3 05:26:37 2008
@@ -7,11 +7,20 @@
 #
 ##===----------------------------------------------------------------------===##
 
-LEVEL = ../../../..
-
 ifndef LLVMC_PLUGIN
-$(error LLVMC_PLUGIN variable is not defined!)
-endif
+
+LEVEL = ../../..
+DIRS = $(BUILTIN_PLUGINS)
+
+# TOFIX: DSO versions of plugins are not built
+
+export BUILTIN_LLVMC_PLUGIN=1
+
+include $(LEVEL)/Makefile.common
+
+else # LLVMC_PLUGIN
+
+LEVEL = ../../../..
 
 LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
 TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td)
@@ -40,4 +49,6 @@
 
 AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp
 	$(Verb) $(CMP) -s $@ $< || $(CP) $< $@
-endif
+endif # BUILD_AUTOGENERATED_INC
+
+endif # LLVMC_PLUGIN

Removed: llvm/trunk/tools/llvmc2/plugins/Makefile.plugins
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Makefile.plugins?rev=56998&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Makefile.plugins (original)
+++ llvm/trunk/tools/llvmc2/plugins/Makefile.plugins (removed)
@@ -1,43 +0,0 @@
-##===- tools/llvmc2/plugins/Makefile.plugins ----------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open
-# Source License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../../../..
-
-ifndef LLVMC_PLUGIN
-$(error LLVMC_PLUGIN variable is not defined!)
-endif
-
-LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
-TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td)
-REQUIRES_EH = 1
-
-ifndef BUILTIN_LLVMC_PLUGIN
-LOADABLE_MODULE = 1
-endif
-
-ifneq ($(TOOLS_SOURCE),"")
-BUILD_AUTOGENERATED_INC=1
-BUILT_SOURCES = AutoGenerated.inc
-endif
-
-include $(LEVEL)/Makefile.common
-
-# TOFIX: This should go into Makefile.rules
-
-ifdef BUILD_AUTOGENERATED_INC
-TD_COMMON = $(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