From 6a8b5183bec0dfe2247d8aa6172b4a40f6b0592b Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sun, 16 Jan 2005 02:21:42 +0000 Subject: [PATCH] Update per new Makefile requirements for projects git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19594 91177308-0d34-0410-b5e6-96231b3b80d8 --- projects/Stacker/Makefile.common.in | 27 ++++++++++----------------- projects/sample/Makefile.common.in | 28 +++++++++++----------------- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/projects/Stacker/Makefile.common.in b/projects/Stacker/Makefile.common.in index 55a4f984cff..6620f5b4d86 100644 --- a/projects/Stacker/Makefile.common.in +++ b/projects/Stacker/Makefile.common.in @@ -1,28 +1,21 @@ -# +# Set the name of the project here +PROJECT_NAME := Stacker + # Set this variable to the top of the LLVM source tree. -# LLVM_SRC_ROOT = @LLVM_SRC@ -# # Set this variable to the top level directory where LLVM was built # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config). -# LLVM_OBJ_ROOT = @LLVM_OBJ@ -# -# Include LLVM's Master Makefile. -# -include $(LLVM_OBJ_ROOT)/Makefile.config +# Set the directory root of this project's source files +PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@) -# -# Set the source root and source directory pathnames -# -BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) +# Set the root directory of this project's object files +PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@) -BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@) +# Set the root directory of this project's install prefix +PROJ_INSTALL_ROOT := @prefix@ -# # Include LLVM's Master Makefile. -# -include $(LLVM_SRC_ROOT)/Makefile.rules - +include $(LLVM_OBJ_ROOT)/Makefile.common diff --git a/projects/sample/Makefile.common.in b/projects/sample/Makefile.common.in index 55a4f984cff..2b3025bd011 100644 --- a/projects/sample/Makefile.common.in +++ b/projects/sample/Makefile.common.in @@ -1,28 +1,22 @@ -# +# Set the name of the project here +PROJECT_NAME := sample +PROJ_VERSION := 0.9 + # Set this variable to the top of the LLVM source tree. -# LLVM_SRC_ROOT = @LLVM_SRC@ -# # Set this variable to the top level directory where LLVM was built # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config). -# LLVM_OBJ_ROOT = @LLVM_OBJ@ -# -# Include LLVM's Master Makefile. -# -include $(LLVM_OBJ_ROOT)/Makefile.config +# Set the directory root of this project's source files +PROJ_SRC_ROOT := $(subst //,/,@abs_top_srcdir@) -# -# Set the source root and source directory pathnames -# -BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) +# Set the root directory of this project's object files +PROJ_OBJ_ROOT := $(subst //,/,@abs_top_objdir@) -BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@) +# Set the root directory of this project's install prefix +PROJ_INSTALL_ROOT := @prefix@ -# # Include LLVM's Master Makefile. -# -include $(LLVM_SRC_ROOT)/Makefile.rules - +include $(LLVM_OBJ_ROOT)/Makefile.common -- 2.34.1