From f3b4755aa0eb6f8dd72c41f267b5438d9a03d0d8 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 19 Aug 2004 20:09:14 +0000 Subject: [PATCH] Make the SmallExamples programs compile in their new home. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15923 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/HowToUseJIT/Makefile | 2 +- examples/Makefile | 16 ++++++++++++++++ examples/ModuleMaker/Makefile.common.in | 6 +++--- projects/SmallExamples/HowToUseJIT/Makefile | 2 +- projects/SmallExamples/Makefile | 16 ++++++++++++++++ projects/SmallExamples/ModuleMaker/Makefile.common.in | 6 +++--- 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 examples/Makefile create mode 100644 projects/SmallExamples/Makefile diff --git a/examples/HowToUseJIT/Makefile b/examples/HowToUseJIT/Makefile index 834ad02e3c3..519c38ea090 100644 --- a/examples/HowToUseJIT/Makefile +++ b/examples/HowToUseJIT/Makefile @@ -6,7 +6,7 @@ # the University of Illinois Open Source License. See LICENSE.TXT for details. # ##===----------------------------------------------------------------------===## -LEVEL = ../.. +LEVEL = ../../.. TOOLNAME = HowToUseJIT USEDLIBS = lli-jit lli-interpreter codegen executionengine x86 selectiondag \ scalaropts analysis.a transformutils.a bcreader target.a vmcore \ diff --git a/examples/Makefile b/examples/Makefile new file mode 100644 index 00000000000..6c53f72c387 --- /dev/null +++ b/examples/Makefile @@ -0,0 +1,16 @@ +##===- projects/Makefile ------------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file was developed by the LLVM research group and is distributed under +# the University of Illinois Open Source License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +LEVEL=../.. + +include $(LEVEL)/Makefile.config + +DIRS= +OPTIONAL_DIRS:=$(basename $(shell ls $(SourceDir) | grep -v CVS | grep -v Makefile)) + +include $(BUILD_SRC_ROOT)/Makefile.rules diff --git a/examples/ModuleMaker/Makefile.common.in b/examples/ModuleMaker/Makefile.common.in index b90ad9f9264..1f1cfc3c2e0 100644 --- a/examples/ModuleMaker/Makefile.common.in +++ b/examples/ModuleMaker/Makefile.common.in @@ -3,17 +3,17 @@ # directories up. The source tree location we do not know; let the LLVM # Makefiles find it for us. # -LLVM_OBJ_ROOT=$(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../../.. # # Grab the LLVM configuration file. # -include $(LEVEL)/../../Makefile.config +include $(LEVEL)/../../../Makefile.config # # Reconfigure the source directories # -BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/SmallExamples/ModuleMaker BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) # diff --git a/projects/SmallExamples/HowToUseJIT/Makefile b/projects/SmallExamples/HowToUseJIT/Makefile index 834ad02e3c3..519c38ea090 100644 --- a/projects/SmallExamples/HowToUseJIT/Makefile +++ b/projects/SmallExamples/HowToUseJIT/Makefile @@ -6,7 +6,7 @@ # the University of Illinois Open Source License. See LICENSE.TXT for details. # ##===----------------------------------------------------------------------===## -LEVEL = ../.. +LEVEL = ../../.. TOOLNAME = HowToUseJIT USEDLIBS = lli-jit lli-interpreter codegen executionengine x86 selectiondag \ scalaropts analysis.a transformutils.a bcreader target.a vmcore \ diff --git a/projects/SmallExamples/Makefile b/projects/SmallExamples/Makefile new file mode 100644 index 00000000000..6c53f72c387 --- /dev/null +++ b/projects/SmallExamples/Makefile @@ -0,0 +1,16 @@ +##===- projects/Makefile ------------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file was developed by the LLVM research group and is distributed under +# the University of Illinois Open Source License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +LEVEL=../.. + +include $(LEVEL)/Makefile.config + +DIRS= +OPTIONAL_DIRS:=$(basename $(shell ls $(SourceDir) | grep -v CVS | grep -v Makefile)) + +include $(BUILD_SRC_ROOT)/Makefile.rules diff --git a/projects/SmallExamples/ModuleMaker/Makefile.common.in b/projects/SmallExamples/ModuleMaker/Makefile.common.in index b90ad9f9264..1f1cfc3c2e0 100644 --- a/projects/SmallExamples/ModuleMaker/Makefile.common.in +++ b/projects/SmallExamples/ModuleMaker/Makefile.common.in @@ -3,17 +3,17 @@ # directories up. The source tree location we do not know; let the LLVM # Makefiles find it for us. # -LLVM_OBJ_ROOT=$(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../../.. # # Grab the LLVM configuration file. # -include $(LEVEL)/../../Makefile.config +include $(LEVEL)/../../../Makefile.config # # Reconfigure the source directories # -BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/SmallExamples/ModuleMaker BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) # -- 2.11.0