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

diff --git a/examples/HowToUseJIT/Makefile b/examples/HowToUseJIT/Makefile
index 834ad02e3c327673e7c7f2bf2e5cd523c7c45926..519c38ea0906e71c257539599fcabe0762c12b3d 100644 (file)
--- a/examples/HowToUseJIT/Makefile
+++ b/examples/HowToUseJIT/Makefile
@@ -6,7 +6,7 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 # 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 \
 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 (file)
index 0000000..6c53f72
--- /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 b90ad9f92649bc5853b469846250fd64c6ad4637..1f1cfc3c2e06185bc5d6783898b0eb595c37c450 100644 (file)
--- 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.
 #
 # 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.
 #
 
 #
 # Grab the LLVM configuration file.
 #

-include $(LEVEL)/../../Makefile.config
+include $(LEVEL)/../../../Makefile.config

 
 #
 # Reconfigure the source directories
 #
 
 #
 # 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)))
 
 #
 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 834ad02e3c327673e7c7f2bf2e5cd523c7c45926..519c38ea0906e71c257539599fcabe0762c12b3d 100644 (file)
--- 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.
 # 
 ##===----------------------------------------------------------------------===##
 # 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 \
 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 (file)
index 0000000..6c53f72
--- /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 b90ad9f92649bc5853b469846250fd64c6ad4637..1f1cfc3c2e06185bc5d6783898b0eb595c37c450 100644 (file)
--- 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.
 #
 # 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.
 #
 
 #
 # Grab the LLVM configuration file.
 #

-include $(LEVEL)/../../Makefile.config
+include $(LEVEL)/../../../Makefile.config

 
 #
 # Reconfigure the source directories
 #
 
 #
 # 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)))
 
 #
 BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
 
 #